Log message for revision 94468:
- use ApplicationDefaultPermissions directly from new location
Changed:
U Zope/branches/2.10/lib/python/AccessControl/Permission.py
U Zope/branches/2.10/lib/python/Globals/__init__.py
-=-
Modified: Zope/branches/2.10/lib/python/AccessControl/Permission.py
===================================================================
--- Zope/branches/2.10/lib/python/AccessControl/Permission.py 2009-01-03
09:18:28 UTC (rev 94467)
+++ Zope/branches/2.10/lib/python/AccessControl/Permission.py 2009-01-03
12:23:22 UTC (rev 94468)
@@ -15,9 +15,8 @@
$Id$
"""
-import string, Products, Globals
+import string, Products
-
name_trans=filter(lambda c, an=string.letters+string.digits+'_': c not in an,
map(chr,range(256)))
name_trans=string.maketrans(''.join(name_trans), '_'*len(name_trans))
@@ -133,8 +132,8 @@
Products.__ac_permissions__=(
Products_permissions + ((perm, (), default),))
mangled=pname(perm) # get mangled permission name
- if not hasattr(Globals.ApplicationDefaultPermissions, mangled):
- setattr(Globals.ApplicationDefaultPermissions,
+ if not hasattr(ApplicationDefaultPermissions, mangled):
+ setattr(ApplicationDefaultPermissions,
mangled, default)
class ApplicationDefaultPermissions:
Modified: Zope/branches/2.10/lib/python/Globals/__init__.py
===================================================================
--- Zope/branches/2.10/lib/python/Globals/__init__.py 2009-01-03 09:18:28 UTC
(rev 94467)
+++ Zope/branches/2.10/lib/python/Globals/__init__.py 2009-01-03 12:23:22 UTC
(rev 94468)
@@ -23,10 +23,11 @@
import Acquisition, ComputedAttribute, App.PersistentExtra, os
import TreeDisplay
+from AccessControl.Permission import ApplicationDefaultPermissions
from App.Common import package_home, attrget, Dictionary
from App.config import getConfiguration as _getConfiguration
from Persistence import Persistent, PersistentMapping
-from App.class_init import default__class_init__, ApplicationDefaultPermissions
+from App.class_init import default__class_init__
# Nicer alias for class initializer.
InitializeClass = default__class_init__
_______________________________________________
Zope-Checkins maillist - Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins
