[Checkins] SVN: megrok.login/trunk/src/megrok/login/grokker.py Conditionally use newer Grok API to setup utilities.
Uli Fouquet
uli at gnufix.de
Wed Dec 9 09:51:48 EST 2009
Log message for revision 106333:
Conditionally use newer Grok API to setup utilities.
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 2009-12-09 14:50:51 UTC (rev 106332)
+++ megrok.login/trunk/src/megrok/login/grokker.py 2009-12-09 14:51:48 UTC (rev 106333)
@@ -33,9 +33,17 @@
return True
def authenticationSubscriber(site, event):
- grok.meta.setupUtility(site, PluggableAuthentication(), IAuthentication,
- setup=setupPAU,
- name_in_container='megrok_login_pau')
+ try:
+ # Conditional import. Newer versions of grok do not provide
+ # `setupUtility` any more...
+ from grok.meta import setupUtility
+ except ImportError:
+ from grokcore.site.interfaces import IUtilityInstaller
+ setupUtility = component.getUtility(IUtilityInstaller)
+ setupUtility(site, PluggableAuthentication(), IAuthentication,
+ setup=setupPAU,
+ name_in_container='megrok_login_pau')
+
def setupPAU(pau):
More information about the checkins
mailing list