[Checkins] SVN: zope.app.security/trunk/ Cleanup code a bit, replace old __used_for__ statements by ``adapts`` calls.

[Dan Korostelev]

Log message for revision 97714:
  Cleanup code a bit, replace old __used_for__ statements by ``adapts`` calls.

Changed:
  U   zope.app.security/trunk/CHANGES.txt
  U   zope.app.security/trunk/setup.py
  U   zope.app.security/trunk/src/zope/app/security/basicauthadapter.py
  U   zope.app.security/trunk/src/zope/app/security/browser/principalterms.py
  U   zope.app.security/trunk/src/zope/app/security/ftpauth.py
  U   zope.app.security/trunk/src/zope/app/security/loginpassword.py
  U   zope.app.security/trunk/src/zope/app/security/permission.py
  U   zope.app.security/trunk/src/zope/app/security/principalregistry.py
  U   zope.app.security/trunk/src/zope/app/security/vocabulary.py

-=-
Modified: zope.app.security/trunk/CHANGES.txt
===================================================================
--- zope.app.security/trunk/CHANGES.txt	2009-03-09 18:30:47 UTC (rev 97713)
+++ zope.app.security/trunk/CHANGES.txt	2009-03-09 18:52:31 UTC (rev 97714)
@@ -23,6 +23,9 @@
 - Remove deprecated code, thus removing explicit dependency on
   zope.deprecation and zope.deferredimport.
 
+- Cleanup code a bit, replace old __used_for__ statements by ``adapts``
+  calls.
+
 3.6.0 (2009-01-31)
 ------------------
 

Modified: zope.app.security/trunk/setup.py
===================================================================
--- zope.app.security/trunk/setup.py	2009-03-09 18:30:47 UTC (rev 97713)
+++ zope.app.security/trunk/setup.py	2009-03-09 18:52:31 UTC (rev 97714)
@@ -80,6 +80,7 @@
                         'zope.publisher',
                         'zope.schema',
                         'zope.security',
+                        'zope.site',
                         'ZODB3',
                         ],
       include_package_data = True,

Modified: zope.app.security/trunk/src/zope/app/security/basicauthadapter.py
===================================================================
--- zope.app.security/trunk/src/zope/app/security/basicauthadapter.py	2009-03-09 18:30:47 UTC (rev 97713)
+++ zope.app.security/trunk/src/zope/app/security/basicauthadapter.py	2009-03-09 18:52:31 UTC (rev 97714)
@@ -15,17 +15,16 @@
 
 $Id$
 """
+from zope.component import adapts
 from zope.publisher.interfaces.http import IHTTPCredentials
-from loginpassword import LoginPassword
+from zope.app.security.loginpassword import LoginPassword
 
 
 class BasicAuthAdapter(LoginPassword):
     """Adapter for handling HTTP Basic Auth."""
 
-    __used_for__ = IHTTPCredentials
+    adapts(IHTTPCredentials)
 
-    __request = None
-
     def __init__(self, request):
         self.__request = request
         # TODO base64 decoding should be done here, not in request
@@ -34,7 +33,7 @@
             login, password = None, None
         else:
             login, password = lpw
-        LoginPassword.__init__(self, login, password)
+        super(BasicAuthAdapter, self).__init__(login, password)
 
     def needLogin(self, realm):
-        self.__request.unauthorized('basic realm="%s"'% realm)
+        self.__request.unauthorized('basic realm="%s"' % realm)

Modified: zope.app.security/trunk/src/zope/app/security/browser/principalterms.py
===================================================================
--- zope.app.security/trunk/src/zope/app/security/browser/principalterms.py	2009-03-09 18:30:47 UTC (rev 97713)
+++ zope.app.security/trunk/src/zope/app/security/browser/principalterms.py	2009-03-09 18:52:31 UTC (rev 97714)
@@ -17,7 +17,7 @@
 """
 __docformat__ = "reStructuredText"
 
-from zope.component import getUtility
+from zope.component import getUtility, adapts
 from zope.interface import implements
 from zope.browser.interfaces import ITerms
 from zope.publisher.interfaces.browser import IBrowserRequest
@@ -33,7 +33,7 @@
 
 class PrincipalTerms(object):
     implements(ITerms)
-    __used_for__ = IPrincipalSource, IBrowserRequest
+    adapts(IPrincipalSource, IBrowserRequest)
 
     def __init__(self, context, request):
         self.context = context

Modified: zope.app.security/trunk/src/zope/app/security/ftpauth.py
===================================================================
--- zope.app.security/trunk/src/zope/app/security/ftpauth.py	2009-03-09 18:30:47 UTC (rev 97713)
+++ zope.app.security/trunk/src/zope/app/security/ftpauth.py	2009-03-09 18:52:31 UTC (rev 97714)
@@ -15,14 +15,14 @@
 
 $Id$
 """
+from zope.component import adapts
 from zope.publisher.interfaces.ftp import IFTPCredentials
-from loginpassword import LoginPassword
+from zope.app.security.loginpassword import LoginPassword
 
 class FTPAuth(LoginPassword):
-    """Adapter for handling common FTP authentication.""" 
-    __used_for__ = IFTPCredentials
+    """Adapter for handling common FTP authentication."""
 
-    __request = None
+    adapts(IFTPCredentials)
 
     def __init__(self, request):
         self.__request = request
@@ -31,7 +31,7 @@
             login, password = None, None
         else:
             login, password = lpw
-        LoginPassword.__init__(self, login, password)
+        super(FTPAuth, self).__init__(login, password)
 
     def needLogin(self, realm):
         self.__request.unauthorized("Did not work")

Modified: zope.app.security/trunk/src/zope/app/security/loginpassword.py
===================================================================
--- zope.app.security/trunk/src/zope/app/security/loginpassword.py	2009-03-09 18:30:47 UTC (rev 97713)
+++ zope.app.security/trunk/src/zope/app/security/loginpassword.py	2009-03-09 18:52:31 UTC (rev 97714)
@@ -16,7 +16,7 @@
 $Id$
 """
 from zope.interface import implements
-from interfaces import ILoginPassword
+from zope.app.security.interfaces import ILoginPassword
 
 class LoginPassword(object):
 

Modified: zope.app.security/trunk/src/zope/app/security/permission.py
===================================================================
--- zope.app.security/trunk/src/zope/app/security/permission.py	2009-03-09 18:30:47 UTC (rev 97713)
+++ zope.app.security/trunk/src/zope/app/security/permission.py	2009-03-09 18:52:31 UTC (rev 97714)
@@ -18,11 +18,10 @@
 __docformat__ = 'restructuredtext'
 
 from persistent import Persistent
-
-from zope.app.security.i18n import _
 from zope.interface import implements
 from zope.location import Location
 from zope.security.interfaces import IPermission
+from zope.app.security.i18n import _
 
 NULL_ID = _('<permission not activated>')
 

Modified: zope.app.security/trunk/src/zope/app/security/principalregistry.py
===================================================================
--- zope.app.security/trunk/src/zope/app/security/principalregistry.py	2009-03-09 18:30:47 UTC (rev 97713)
+++ zope.app.security/trunk/src/zope/app/security/principalregistry.py	2009-03-09 18:52:31 UTC (rev 97714)
@@ -17,18 +17,21 @@
 """
 from zope.component import getUtility
 from zope.interface import implements
+from zope.container.contained import Contained, contained
 
-from zope.app.security.interfaces import PrincipalLookupError
+import zope.security.management
 from zope.security.interfaces import IGroupAwarePrincipal
-import zope.security.management
-from zope.app.security import interfaces
-from zope.container.contained import Contained, contained
 from zope.password.interfaces import IPasswordManager
 
+from zope.app.security import interfaces
 
-class DuplicateLogin(Exception): pass
-class DuplicateId(Exception): pass
 
+class DuplicateLogin(Exception):
+    pass
+
+class DuplicateId(Exception):
+    pass
+
 class PrincipalRegistry(object):
 
     implements(interfaces.IAuthentication, interfaces.ILogout)
@@ -75,7 +78,7 @@
                 return self.__defaultObject
             if id == zope.security.management.system_user.id:
                 return zope.security.management.system_user
-            raise PrincipalLookupError(id)
+            raise interfaces.PrincipalLookupError(id)
         return r
 
     def getPrincipalByLogin(self, login):

Modified: zope.app.security/trunk/src/zope/app/security/vocabulary.py
===================================================================
--- zope.app.security/trunk/src/zope/app/security/vocabulary.py	2009-03-09 18:30:47 UTC (rev 97713)
+++ zope.app.security/trunk/src/zope/app/security/vocabulary.py	2009-03-09 18:52:31 UTC (rev 97714)
@@ -25,11 +25,11 @@
 from zope.schema.interfaces import ISourceQueriables, IVocabularyFactory
 from zope.security.interfaces import IPermission
 from zope.security.checker import CheckerPublic
+from zope.site.next import queryNextUtility
 
 from zope.app.security.interfaces import IAuthentication
+from zope.app.security.interfaces import IPrincipalSource
 from zope.app.security.interfaces import PrincipalLookupError
-from zope.app.security.interfaces import IPrincipalSource
-from zope.app.component import queryNextUtility
 from zope.app.component.vocabulary import UtilityVocabulary