[Zope3-checkins] CVS: Zope3/src/zope/app/services - adapter.py:1.8 auth.py:1.11 errorr.py:1.6 event.py:1.10 queryfield.py:1.2 view.py:1.6 viewpackage.py:1.6 zpt.py:1.6

[Sidnei da Silva]

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

Modified Files:
	adapter.py auth.py errorr.py event.py queryfield.py view.py 
	viewpackage.py zpt.py 
Log Message:
Merging paris-copypasterename-branch. Not very fun :(

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


=== Zope3/src/zope/app/services/auth.py 1.10 => 1.11 ===
--- Zope3/src/zope/app/services/auth.py:1.10	Thu Feb  6 01:49:56 2003
+++ Zope3/src/zope/app/services/auth.py	Tue Feb 11 10:59:56 2003
@@ -30,10 +30,9 @@
 from zope.app.interfaces.security import ILoginPassword
 from zope.app.interfaces.security import IAuthenticationService
 
-from zope.app.interfaces.services.auth import IUser
+from zope.app.interfaces.services.auth import IAnnotatableUser
 
 from zope.proxy.introspection import removeAllProxies
-from zope.app.interfaces.annotation import IAttributeAnnotatable
 from zope.app.attributeannotations import AttributeAnnotations
 from zope.app.security.grants.principalrole import principalRoleManager
 from zope.app.component.nextservice import getNextService
@@ -166,7 +165,7 @@
 class User(Persistent):
     """A persistent implementation of the IUser interface """
 
-    __implements__ =  IUser, IAttributeAnnotatable
+    __implements__ =  IAnnotatableUser
 
     def __init__(self, id, title, description, login, pw):
         self.__id = id


=== Zope3/src/zope/app/services/errorr.py 1.5 => 1.6 ===
--- Zope3/src/zope/app/services/errorr.py:1.5	Thu Feb  6 16:07:05 2003
+++ Zope3/src/zope/app/services/errorr.py	Tue Feb 11 10:59:56 2003
@@ -12,8 +12,8 @@
 #
 ##############################################################################
 """
-
 Revision information:
+
 $Id$
 """
 


=== Zope3/src/zope/app/services/event.py 1.9 => 1.10 ===


=== Zope3/src/zope/app/services/queryfield.py 1.1 => 1.2 ===


=== Zope3/src/zope/app/services/view.py 1.5 => 1.6 ===


=== Zope3/src/zope/app/services/viewpackage.py 1.5 => 1.6 ===


=== Zope3/src/zope/app/services/zpt.py 1.5 => 1.6 ===