[Zope3-checkins] CVS: Zope3/src/zope/app/interfaces/services - auth.py:1.5 interfaces.py:1.12 query.py:1.8

[Sidnei da Silva]

Update of /cvs-repository/Zope3/src/zope/app/interfaces/services
In directory cvs.zope.org:/tmp/cvs-serv3664/src/zope/app/interfaces/services

Modified Files:
	auth.py interfaces.py query.py 
Log Message:
Merging paris-copypasterename-branch. Not very fun :(

=== Zope3/src/zope/app/interfaces/services/auth.py 1.4 => 1.5 ===
--- Zope3/src/zope/app/interfaces/services/auth.py:1.4	Fri Feb  7 13:18:56 2003
+++ Zope3/src/zope/app/interfaces/services/auth.py	Tue Feb 11 10:59:51 2003
@@ -16,6 +16,7 @@
 """
 from zope.interface import Interface
 from zope.app.interfaces.security import IPrincipal
+from zope.app.interfaces.annotation import IAttributeAnnotatable
 
 class IReadUser(IPrincipal):
     """Read interface for a User."""
@@ -50,4 +51,7 @@
 
 
 class IUser(IReadUser, IWriteUser):
-    """A user object for the Local Authentication Service."""
+    """An user object for the Local Authentication Service."""
+
+class IAnnotatableUser(IUser, IAttributeAnnotatable):
+    """An annotatable user object for the Local Authentication Service."""


=== Zope3/src/zope/app/interfaces/services/interfaces.py 1.11 => 1.12 ===


=== Zope3/src/zope/app/interfaces/services/query.py 1.7 => 1.8 ===