[Zope3-checkins] CVS: Zope3/src/zope/app/services - auth.py:1.3

Jim Fulton jim@zope.com
Thu, 26 Dec 2002 13:57:11 -0500


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

Modified Files:
	auth.py 
Log Message:
Cleaned up file layout.


=== Zope3/src/zope/app/services/auth.py 1.2 => 1.3 ===
--- Zope3/src/zope/app/services/auth.py:1.2	Wed Dec 25 09:13:19 2002
+++ Zope3/src/zope/app/services/auth.py	Thu Dec 26 13:57:11 2002
@@ -15,6 +15,7 @@
 $Id$
 """
 from types import TupleType
+from persistence import Persistent
 
 from zope.exceptions import NotFoundError
 from zope.component import getAdapter, queryAdapter
@@ -27,6 +28,13 @@
 
 from zope.app.interfaces.services.auth import IUser
 
+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
+
+
+
 class DuplicateLogin(Exception): pass
 class DuplicateId(Exception): pass
 
@@ -89,19 +97,6 @@
                   if p.getTitle().lower().startswith(name) or
                      p.getLogin().lower().startswith(name)]
 
-
-
-"""A persistent implementation of thr IPrincipal interface
-
-$Id$
-"""
-from persistence import Persistent
-from zope.proxy.introspection import removeAllProxies
-from zope.app.interfaces.annotation import IAttributeAnnotatable
-from zope.app.attributeannotations import AttributeAnnotations
-from zope.app.interfaces.services.auth import IUser
-from zope.app.security.grants.principalrolemanager import \
-     principalRoleManager
 
 class User(Persistent):
     """A persistent implementation of the IUser interface """