Log message for revision 123713: Backport the robustness improvements related to Products.Zope_Hotfix_20111024
Changed: U Zope/branches/2.12/src/AccessControl/SecurityInfo.py U Zope/branches/2.12/src/App/PersistentExtra.py -=- Modified: Zope/branches/2.12/src/AccessControl/SecurityInfo.py =================================================================== --- Zope/branches/2.12/src/AccessControl/SecurityInfo.py 2011-12-12 10:39:17 UTC (rev 123712) +++ Zope/branches/2.12/src/AccessControl/SecurityInfo.py 2011-12-12 10:47:47 UTC (rev 123713) @@ -41,9 +41,14 @@ import sys from logging import getLogger +from App.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') @@ -311,5 +316,4 @@ sec.declareObjectPublic() sec.setDefaultAccess(1) sec.apply(Class) - from App.class_init import InitializeClass InitializeClass(Class) Modified: Zope/branches/2.12/src/App/PersistentExtra.py =================================================================== --- Zope/branches/2.12/src/App/PersistentExtra.py 2011-12-12 10:39:17 UTC (rev 123712) +++ Zope/branches/2.12/src/App/PersistentExtra.py 2011-12-12 10:47:47 UTC (rev 123713) @@ -42,9 +42,7 @@ from zope.interface import classImplements from Persistence import Persistent - from App.class_init import default__class_init__ from App.interfaces import IPersistentExtra - Persistent.__class_init__ = default__class_init__ for k, v in PersistentUtil.__dict__.items(): if k[0] != '_': _______________________________________________ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins