[Checkins] SVN: megrok.login/trunk/src/megrok/login/authplugins.py Fix imports. Drop support for grok < 1.3.

[Uli Fouquet]

Log message for revision 120227:
  Fix imports. Drop support for grok < 1.3.
  

Changed:
  U   megrok.login/trunk/src/megrok/login/authplugins.py

-=-
Modified: megrok.login/trunk/src/megrok/login/authplugins.py
===================================================================
--- megrok.login/trunk/src/megrok/login/authplugins.py	2011-02-09 11:40:09 UTC (rev 120226)
+++ megrok.login/trunk/src/megrok/login/authplugins.py	2011-02-09 11:43:13 UTC (rev 120227)
@@ -12,24 +12,15 @@
 #
 ##############################################################################
 
-try:
-    from zope.pluggableauth.interfaces import IAuthenticatorPlugin
-except ImportError:
-    # BBB
-    from zope.app.authentication.interfaces import IAuthenticatorPlugin
-
-from zope.app.authentication.interfaces import IQuerySchemaSearch
-try:
-    from zope.pluggableauth.factories import PrincipalInfo
-except ImportError:
-    # BBB
-    from zope.app.authentication.principalfolder import PrincipalInfo
-from zope.app.authentication.principalfolder import (
-    PrincipalFolder, InternalPrincipal
+from zope.pluggableauth.interfaces import (
+    IAuthenticatorPlugin, IQuerySchemaSearch
     )
-from zope.app.authentication.principalfolder import ISearchSchema
-from zope.app.container.interfaces import DuplicateIDError
-from zope.app.security.principalregistry import principalRegistry
+from zope.pluggableauth.factories import PrincipalInfo
+from zope.pluggableauth.plugins.principalfolder import (
+    PrincipalFolder, InternalPrincipal, ISearchSchema,
+    )
+from zope.container.interfaces import DuplicateIDError
+from zope.principalregistry.principalregistry import principalRegistry
 from zope.securitypolicy.interfaces import IPrincipalPermissionManager
 from zope.interface import implements