Changeset 9211 for main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/authentication.py

Timestamp:

21 Sep 2012, 08:19:35 (12 years ago)

Author:

uli

Message:

Rollback r9209. Looks like multiple merges from trunk confuse svn when merging back into trunk.

Location:

main/waeup.kofa/branches/uli-zc-async

Files:

• . (modified) (1 prop)
• src/waeup/kofa/authentication.py (modified) (3 diffs)

main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/authentication.py

@@ -21 +21 @@
 from zope.event import notify
 from zope.component import getUtility, getUtilitiesFor
-from zope.component.interfaces import IFactory
 from zope.interface import Interface
 from zope.schema import getFields
@@ -36 +35 @@
 from waeup.kofa.interfaces import (ILocalRoleSetEvent,
     IUserAccount, IAuthPluginUtility, IPasswordValidator,
-    IKofaPrincipal, IKofaPrincipalInfo, IKofaPluggable,
-    IBatchProcessor)
-from waeup.kofa.utils.batching import BatchProcessor
+    IKofaPrincipal, IKofaPrincipalInfo, IKofaPluggable)
 
 def setup_authentication(pau):
@@ -366 +363 @@
                 obj, local_role, user_name, granted=False))
     return
-
-class UserAccountFactory(grok.GlobalUtility):
-    """A factory for user accounts.
-
-    This factory is only needed for imports.
-    """
-    grok.implements(IFactory)
-    grok.name(u'waeup.UserAccount')
-    title = u"Create a user.",
-    description = u"This factory instantiates new user account instances."
-
-    def __call__(self, *args, **kw):
-        return Account(name=None, password='')
-
-    def getInterfaces(self):
-        return implementedBy(Account)
-
-class UserProcessor(BatchProcessor):
-    """A batch processor for IUserAccount objects.
-    """
-    grok.implements(IBatchProcessor)
-    grok.provides(IBatchProcessor)
-    grok.context(Interface)
-    util_name = 'userprocessor'
-    grok.name(util_name)
-
-    name = u'User Processor'
-    iface = IUserAccount
-
-    location_fields = ['name',]
-    factory_name = 'waeup.UserAccount'
-
-    mode = None
-
-    def parentsExist(self, row, site):
-        return 'users' in site.keys()
-
-    def entryExists(self, row, site):
-        return row['name'] in site['users'].keys()
-
-    def getParent(self, row, site):
-        return site['users']
-
-    def getEntry(self, row, site):
-        if not self.entryExists(row, site):
-            return None
-        parent = self.getParent(row, site)
-        return parent.get(row['name'])
-
-    def addEntry(self, obj, row, site):
-        parent = self.getParent(row, site)
-        parent.addAccount(obj)
-        return
-
 
 class UsersPlugin(grok.GlobalUtility):