[Zope-Checkins] SVN: Zope/branches/2.13/ Merge c123739 from 2.12 branch

[Hanno Schlichting]

Log message for revision 123740:
  Merge c123739 from 2.12 branch
  

Changed:
  U   Zope/branches/2.13/doc/CHANGES.rst
  U   Zope/branches/2.13/src/OFS/ObjectManager.py

-=-
Modified: Zope/branches/2.13/doc/CHANGES.rst
===================================================================
--- Zope/branches/2.13/doc/CHANGES.rst	2011-12-12 12:44:47 UTC (rev 123739)
+++ Zope/branches/2.13/doc/CHANGES.rst	2011-12-12 12:47:57 UTC (rev 123740)
@@ -8,6 +8,8 @@
 2.13.11 (unreleased)
 --------------------
 
+- LP #902068: Fixed missing security declaration for `ObjectManager` class.
+
 - Avoid conflicting signal registrations when run under mod_wsgi.
   Allows the use of `WSGIRestrictSignal Off` (LP #681853).
 

Modified: Zope/branches/2.13/src/OFS/ObjectManager.py
===================================================================
--- Zope/branches/2.13/src/OFS/ObjectManager.py	2011-12-12 12:44:47 UTC (rev 123739)
+++ Zope/branches/2.13/src/OFS/ObjectManager.py	2011-12-12 12:47:57 UTC (rev 123740)
@@ -795,7 +795,7 @@
     def keys(self):
         return self.objectIds()
 
-    security.declareProtected(access_contents_information, 'get')
+    security.declareProtected(access_contents_information, 'items')
     def items(self):
         return self.objectItems()