[Checkins] SVN: z3c.saconfig/trunk/ Support current ZTK code
Wichert Akkerman
wichert at wiggy.net
Mon Dec 14 18:00:37 EST 2009
Log message for revision 106508:
Support current ZTK code
Changed:
U z3c.saconfig/trunk/CHANGES.txt
U z3c.saconfig/trunk/src/z3c/saconfig/zcml.py
-=-
Modified: z3c.saconfig/trunk/CHANGES.txt
===================================================================
--- z3c.saconfig/trunk/CHANGES.txt 2009-12-14 22:55:20 UTC (rev 106507)
+++ z3c.saconfig/trunk/CHANGES.txt 2009-12-14 23:00:37 UTC (rev 106508)
@@ -4,6 +4,8 @@
0.9.2 (unreleased)
==================
+- Support current ZTK code
+
- engine.echo must default to None for SQLAlchemy to honor
logging.getLogger("sqlalchemy.engine").setLevel(...)
Modified: z3c.saconfig/trunk/src/z3c/saconfig/zcml.py
===================================================================
--- z3c.saconfig/trunk/src/z3c/saconfig/zcml.py 2009-12-14 22:55:20 UTC (rev 106507)
+++ z3c.saconfig/trunk/src/z3c/saconfig/zcml.py 2009-12-14 23:00:37 UTC (rev 106508)
@@ -1,6 +1,11 @@
import zope.interface
import zope.schema
import zope.component.zcml
+try:
+ from zope.component.security import PublicPermission
+except ImportError:
+ # BBB for Zope 2.10
+ from zope.component.zcml import PublicPermission
from zope.configuration.name import resolve
import utility
@@ -78,7 +83,7 @@
_context,
provides=interfaces.IEngineFactory,
component=factory,
- permission=zope.component.zcml.PublicPermission,
+ permission=PublicPermission,
name=name)
if setup:
@@ -100,5 +105,5 @@
_context,
provides=interfaces.IScopedSession,
component=scoped_session,
- permission=zope.component.zcml.PublicPermission,
+ permission=PublicPermission,
name=name)
More information about the checkins
mailing list