[Checkins] SVN: megrok.login/trunk/src/megrok/login/grokker.py Fix imports. Drop support for older grok versions.
Uli Fouquet
uli at gnufix.de
Wed Feb 9 06:40:09 EST 2011
Log message for revision 120226:
Fix imports. Drop support for older grok versions.
Changed:
U megrok.login/trunk/src/megrok/login/grokker.py
-=-
Modified: megrok.login/trunk/src/megrok/login/grokker.py
===================================================================
--- megrok.login/trunk/src/megrok/login/grokker.py 2011-02-09 11:37:34 UTC (rev 120225)
+++ megrok.login/trunk/src/megrok/login/grokker.py 2011-02-09 11:40:09 UTC (rev 120226)
@@ -2,22 +2,10 @@
import grok
import megrok.login
from zope import component
-try:
- from zope.pluggableauth import PluggableAuthentication
-except ImportError:
- # BBB
- from zope.app.authentication import PluggableAuthentication
-from zope.app.authentication.principalfolder import PrincipalFolder
-try:
- from zope.pluggableauth.plugins.session import SessionCredentialsPlugin
-except ImportError:
- # BBB
- from zope.app.authentication.session import SessionCredentialsPlugin
-try:
- from zope.authentication.interfaces import IAuthentication
-except ImportError:
- # BBB
- from zope.app.security.interfaces import IAuthentication
+from zope.pluggableauth import PluggableAuthentication
+from zope.pluggableauth.plugins.principalfolder import PrincipalFolder
+from zope.pluggableauth.plugins.session import SessionCredentialsPlugin
+from zope.authentication.interfaces import IAuthentication
from megrok.login.authplugins import (PrincipalRegistryAuthenticator,
AutoRegisteringPrincipalFolder)
More information about the checkins
mailing list