[Checkins] SVN: AccessControl/trunk/ Merge c123703 from 2.13 branch

[Hanno Schlichting]

Log message for revision 123704:
  Merge c123703 from 2.13 branch
  

Changed:
  U   AccessControl/trunk/CHANGES.txt
  U   AccessControl/trunk/src/AccessControl/SecurityInfo.py
  U   AccessControl/trunk/src/AccessControl/userfolder.py

-=-
Modified: AccessControl/trunk/CHANGES.txt
===================================================================
--- AccessControl/trunk/CHANGES.txt	2011-12-12 10:16:57 UTC (rev 123703)
+++ AccessControl/trunk/CHANGES.txt	2011-12-12 10:18:38 UTC (rev 123704)
@@ -6,6 +6,12 @@
 
 - Added decorators for public, private and protected security declarations.
 
+2.13.5 (unreleased)
+-------------------
+
+- Apply changes made available in `Products.Zope_Hotfix_20111024` and make them
+  more robust.
+
 2.13.4 (2011-01-11)
 -------------------
 

Modified: AccessControl/trunk/src/AccessControl/SecurityInfo.py
===================================================================
--- AccessControl/trunk/src/AccessControl/SecurityInfo.py	2011-12-12 10:16:57 UTC (rev 123703)
+++ AccessControl/trunk/src/AccessControl/SecurityInfo.py	2011-12-12 10:18:38 UTC (rev 123704)
@@ -41,9 +41,14 @@
 import sys
 from logging import getLogger
 
+from AccessControl.class_init import InitializeClass
 from AccessControl.ImplPython import _what_not_even_god_should_do
 from Acquisition import Implicit
+from Persistence import Persistent
 
+# always patch Persistent before ClassSecurityInfo is used
+Persistent.__class_init__ = InitializeClass
+
 LOG = getLogger('SecurityInfo')
 
 
@@ -347,5 +352,4 @@
     sec.declareObjectPublic()
     sec.setDefaultAccess(1)
     sec.apply(Class)
-    from AccessControl.class_init import InitializeClass
     InitializeClass(Class)

Modified: AccessControl/trunk/src/AccessControl/userfolder.py
===================================================================
--- AccessControl/trunk/src/AccessControl/userfolder.py	2011-12-12 10:16:57 UTC (rev 123703)
+++ AccessControl/trunk/src/AccessControl/userfolder.py	2011-12-12 10:18:38 UTC (rev 123704)
@@ -355,7 +355,9 @@
         """ returns true if domain auth mode is set to true"""
         return getattr(self, '_domain_auth_mode', None)
 
+InitializeClass(BasicUserFolder)
 
+
 class UserFolder(BasicUserFolder):
     """Standard UserFolder object