[Zope-Checkins] SVN: Zope/branches/2.11/lib/python/ - use ApplicationDefaultPermissions directly from new location

[Yvo Schubbe]

Log message for revision 94469:
  - use ApplicationDefaultPermissions directly from new location

Changed:
  U   Zope/branches/2.11/lib/python/AccessControl/Permission.py
  U   Zope/branches/2.11/lib/python/Globals/__init__.py

-=-
Modified: Zope/branches/2.11/lib/python/AccessControl/Permission.py
===
--- Zope/branches/2.11/lib/python/AccessControl/Permission.py   2009-01-03 
12:23:22 UTC (rev 94468)
+++ Zope/branches/2.11/lib/python/AccessControl/Permission.py   2009-01-03 
12:24:33 UTC (rev 94469)
@@ -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.11/lib/python/Globals/__init__.py
===
--- Zope/branches/2.11/lib/python/Globals/__init__.py   2009-01-03 12:23:22 UTC 
(rev 94468)
+++ Zope/branches/2.11/lib/python/Globals/__init__.py   2009-01-03 12:24:33 UTC 
(rev 94469)
@@ -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

[Zope-Checkins] SVN: Zope/trunk/lib/python/AccessControl/Permission.py - use ApplicationDefaultPermissions directly from new location

[Yvo Schubbe]

Log message for revision 94470:
  - use ApplicationDefaultPermissions directly from new location

Changed:
  UU  Zope/trunk/lib/python/AccessControl/Permission.py

-=-
Modified: Zope/trunk/lib/python/AccessControl/Permission.py
===
--- Zope/trunk/lib/python/AccessControl/Permission.py   2009-01-03 12:24:33 UTC 
(rev 94469)
+++ Zope/trunk/lib/python/AccessControl/Permission.py   2009-01-03 12:25:27 UTC 
(rev 94470)
@@ -7,7 +7,7 @@
 # THIS SOFTWARE IS PROVIDED AS IS AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE
+# FOR A PARTICULAR PURPOSE.
 #
 ##
 Permissions
@@ -121,7 +121,6 @@
 def registerPermissions(permissions, defaultDefault=('Manager',)):
 Register an __ac_permissions__ sequence.
 
-from App.class_init import ApplicationDefaultPermissions
 import Products
 for setting in permissions:
 if _registerdPermission(setting[0]): continue
@@ -140,5 +139,5 @@
 mangled, default)
 
 class ApplicationDefaultPermissions:
-_View_Permission='Manager', 'Anonymous'
-_Access_contents_information_Permission='Manager', 'Anonymous'
+_View_Permission = ('Manager', 'Anonymous')
+_Access_contents_information_Permission = ('Manager', 'Anonymous')


Property changes on: Zope/trunk/lib/python/AccessControl/Permission.py
___
Deleted: cvs2svn:cvs-rev
   - 1.10

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/trunk/lib/python/Globals/__init__.py Fix typos.

[Stefan H. Holek]

Log message for revision 94481:
  Fix typos.

Changed:
  U   Zope/trunk/lib/python/Globals/__init__.py

-=-
Modified: Zope/trunk/lib/python/Globals/__init__.py
===
--- Zope/trunk/lib/python/Globals/__init__.py   2009-01-03 15:42:02 UTC (rev 
94480)
+++ Zope/trunk/lib/python/Globals/__init__.py   2009-01-03 15:47:11 UTC (rev 
94481)
@@ -24,9 +24,9 @@
   )
 
 deprecated(import from App.Common instead,
-   package_home = 'App.Common.package_home',
-   attrget = 'App.Common.attrget',
-   Dictionary = 'App.Common.Dictionary',
+   package_home = 'App.Common:package_home',
+   attrget = 'App.Common:attrget',
+   Dictionary = 'App.Common:Dictionary',
   )
 
 deprecated(import from Persistence instead,

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/branches/2.10/ - added 'InitializeClass' alias to ease migration

[Yvo Schubbe]

Log message for revision 94482:
  - added 'InitializeClass' alias to ease migration

Changed:
  U   Zope/branches/2.10/doc/CHANGES.txt
  U   Zope/branches/2.10/lib/python/App/class_init.py
  U   Zope/branches/2.10/lib/python/Globals/__init__.py

-=-
Modified: Zope/branches/2.10/doc/CHANGES.txt
===
--- Zope/branches/2.10/doc/CHANGES.txt  2009-01-03 15:47:11 UTC (rev 94481)
+++ Zope/branches/2.10/doc/CHANGES.txt  2009-01-03 15:54:16 UTC (rev 94482)
@@ -8,7 +8,11 @@
 
 Restructuring
 
-  - Moved 'ApplicationDefaultPermissiosn' from 'App.class_init' to
+  - Added 'InitializeClass' alias in 'App.class_init' to ease migration.
+In Zope 2.12 it will be recommended to import 'InitializeClass' from
+'App.class_init' instead of 'Globals'.
+
+  - Moved 'ApplicationDefaultPermissions' from 'App.class_init' to
 'AccessControl.Permissions', in order to break an import cycle
 in third-party code which avoids imports from 'Globals.'  Left
 the class importable from its old location without deprecation.

Modified: Zope/branches/2.10/lib/python/App/class_init.py
===
--- Zope/branches/2.10/lib/python/App/class_init.py 2009-01-03 15:47:11 UTC 
(rev 94481)
+++ Zope/branches/2.10/lib/python/App/class_init.py 2009-01-03 15:54:16 UTC 
(rev 94482)
@@ -79,3 +79,5 @@
 Class %s.%s has a security declaration for 
 nonexistent method %r, self.__module__,
 self.__name__, mname)
+
+InitializeClass = default__class_init__ # future name

Modified: Zope/branches/2.10/lib/python/Globals/__init__.py
===
--- Zope/branches/2.10/lib/python/Globals/__init__.py   2009-01-03 15:47:11 UTC 
(rev 94481)
+++ Zope/branches/2.10/lib/python/Globals/__init__.py   2009-01-03 15:54:16 UTC 
(rev 94482)
@@ -27,11 +27,7 @@
 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__
-
-# Nicer alias for class initializer.
-InitializeClass = default__class_init__
-
+from App.class_init import InitializeClass, default__class_init__
 from App.special_dtml import HTML, HTMLFile, DTMLFile
 from App.Dialogs import MessageDialog
 from App.ImageFile import ImageFile

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/branches/2.11/ - added 'InitializeClass' alias to ease migration

[Yvo Schubbe]

Log message for revision 94483:
  - added 'InitializeClass' alias to ease migration

Changed:
  U   Zope/branches/2.11/doc/CHANGES.txt
  U   Zope/branches/2.11/lib/python/App/class_init.py
  U   Zope/branches/2.11/lib/python/Globals/__init__.py

-=-
Modified: Zope/branches/2.11/doc/CHANGES.txt
===
--- Zope/branches/2.11/doc/CHANGES.txt  2009-01-03 15:54:16 UTC (rev 94482)
+++ Zope/branches/2.11/doc/CHANGES.txt  2009-01-03 15:54:35 UTC (rev 94483)
@@ -8,7 +8,11 @@
 
 Restructuring
 
-  - Moved 'ApplicationDefaultPermissiosn' from 'App.class_init' to
+  - Added 'InitializeClass' alias in 'App.class_init' to ease migration.
+In Zope 2.12 it will be recommended to import 'InitializeClass' from
+'App.class_init' instead of 'Globals'.
+
+  - Moved 'ApplicationDefaultPermissions' from 'App.class_init' to
 'AccessControl.Permissions', in order to break an import cycle
 in third-party code which avoids imports from 'Globals.'  Left
 the class importable from its old location without deprecation.

Modified: Zope/branches/2.11/lib/python/App/class_init.py
===
--- Zope/branches/2.11/lib/python/App/class_init.py 2009-01-03 15:54:16 UTC 
(rev 94482)
+++ Zope/branches/2.11/lib/python/App/class_init.py 2009-01-03 15:54:35 UTC 
(rev 94483)
@@ -79,3 +79,5 @@
 Class %s.%s has a security declaration for 
 nonexistent method %r, self.__module__,
 self.__name__, mname)
+
+InitializeClass = default__class_init__ # future name

Modified: Zope/branches/2.11/lib/python/Globals/__init__.py
===
--- Zope/branches/2.11/lib/python/Globals/__init__.py   2009-01-03 15:54:16 UTC 
(rev 94482)
+++ Zope/branches/2.11/lib/python/Globals/__init__.py   2009-01-03 15:54:35 UTC 
(rev 94483)
@@ -27,11 +27,7 @@
 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__
-
-# Nicer alias for class initializer.
-InitializeClass = default__class_init__
-
+from App.class_init import InitializeClass, default__class_init__
 from App.special_dtml import HTML, HTMLFile, DTMLFile
 from App.Dialogs import MessageDialog
 from App.ImageFile import ImageFile

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/trunk/lib/python/App/class_init.py - made InitializeClass the default name

[Yvo Schubbe]

Log message for revision 94484:
  - made InitializeClass the default name

Changed:
  UU  Zope/trunk/lib/python/App/class_init.py

-=-
Modified: Zope/trunk/lib/python/App/class_init.py
===
--- Zope/trunk/lib/python/App/class_init.py 2009-01-03 15:54:35 UTC (rev 
94483)
+++ Zope/trunk/lib/python/App/class_init.py 2009-01-03 15:55:39 UTC (rev 
94484)
@@ -7,21 +7,24 @@
 # THIS SOFTWARE IS PROVIDED AS IS AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE
+# FOR A PARTICULAR PURPOSE.
 #
 ##
+Class initialization.
 
+$Id$
+
+
 import logging
 
 from AccessControl.Permission import ApplicationDefaultPermissions # BBB
 
-
-def default__class_init__(self):
+def InitializeClass(self):
 from AccessControl.Permission import registerPermissions
 from AccessControl.PermissionRole import PermissionRole
 dict=self.__dict__
 have=dict.has_key
-ft=type(default__class_init__)
+ft=type(InitializeClass)
 dict_items=dict.items()
 
 for name, v in dict_items:
@@ -71,7 +74,7 @@
 roles = acp[2]
 pr = PermissionRole(pname, roles)
 else:
-pr=PermissionRole(pname)
+pr = PermissionRole(pname)
 for mname in mnames:
 setattr(self, mname+'__roles__', pr)
 if mname and not hasattr(self, mname):
@@ -80,4 +83,4 @@
 nonexistent method %r, self.__module__,
 self.__name__, mname)
 
-InitializeClass = default__class_init__ # instead of Globals.Initialize
+default__class_init__ = InitializeClass # BBB: old name


Property changes on: Zope/trunk/lib/python/App/class_init.py
___
Deleted: cvs2svn:cvs-rev
   - 1.16
Added: svn:keywords
   + Id

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/trunk/lib/python/Products/Five/security.py Restore Products.Five.security.initializeClass.

[Stefan H. Holek]

Log message for revision 94498:
  Restore Products.Five.security.initializeClass.

Changed:
  U   Zope/trunk/lib/python/Products/Five/security.py

-=-
Modified: Zope/trunk/lib/python/Products/Five/security.py
===
--- Zope/trunk/lib/python/Products/Five/security.py 2009-01-03 23:57:24 UTC 
(rev 94497)
+++ Zope/trunk/lib/python/Products/Five/security.py 2009-01-04 07:44:36 UTC 
(rev 94498)
@@ -26,6 +26,7 @@
 from zope.security.management import thread_local
 from zope.security.simplepolicies import ParanoidSecurityPolicy
 
+from App.class_init import InitializeClass as initializeClass
 from AccessControl.SecurityInfo import ClassSecurityInfo
 from AccessControl.SecurityManagement import getSecurityManager
 

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins