[Checkins] SVN: five.localsitemanager/branches/elro-parent-pointers/ Basic compatibility with parent pointers on Zope trunk.

Laurence Rowe l at lrowe.co.uk
Wed Nov 2 01:52:09 UTC 2011


Log message for revision 123246:
  Basic compatibility with parent pointers on Zope trunk.

Changed:
  U   five.localsitemanager/branches/elro-parent-pointers/CHANGES.txt
  U   five.localsitemanager/branches/elro-parent-pointers/setup.py
  U   five.localsitemanager/branches/elro-parent-pointers/src/five/localsitemanager/registry.py

-=-
Modified: five.localsitemanager/branches/elro-parent-pointers/CHANGES.txt
===================================================================
--- five.localsitemanager/branches/elro-parent-pointers/CHANGES.txt	2011-11-02 01:48:08 UTC (rev 123245)
+++ five.localsitemanager/branches/elro-parent-pointers/CHANGES.txt	2011-11-02 01:52:09 UTC (rev 123246)
@@ -1,9 +1,10 @@
 Changelog
 =========
 
-2.0.6 - unreleased
+3.0.0 - unreleased
 ------------------
 
+* Basic compatibility with parent pointers on Zope trunk.
 
 2.0.5 - 2011-02-06
 ------------------

Modified: five.localsitemanager/branches/elro-parent-pointers/setup.py
===================================================================
--- five.localsitemanager/branches/elro-parent-pointers/setup.py	2011-11-02 01:48:08 UTC (rev 123245)
+++ five.localsitemanager/branches/elro-parent-pointers/setup.py	2011-11-02 01:52:09 UTC (rev 123246)
@@ -1,6 +1,6 @@
 from setuptools import setup
 
-version = '2.0.6dev'
+version = '3.0.0dev'
 
 setup(name='five.localsitemanager',
       version=version,

Modified: five.localsitemanager/branches/elro-parent-pointers/src/five/localsitemanager/registry.py
===================================================================
--- five.localsitemanager/branches/elro-parent-pointers/src/five/localsitemanager/registry.py	2011-11-02 01:48:08 UTC (rev 123245)
+++ five.localsitemanager/branches/elro-parent-pointers/src/five/localsitemanager/registry.py	2011-11-02 01:52:09 UTC (rev 123246)
@@ -16,6 +16,7 @@
 import Acquisition
 import persistent
 from Acquisition.interfaces import IAcquirer
+from OFS.Application import Application
 from OFS.ObjectManager import ObjectManager
 from zope.location.interfaces import ISite
 from zope.component.persistentregistry import PersistentComponents
@@ -27,7 +28,8 @@
 from zope.site.hooks import getSite
 import zope.event
 import zope.component.interfaces
-from ZPublisher.BaseRequest import RequestContainer
+from zope.interface import implements
+from zope.location.interfaces import IContained
 
 from five.localsitemanager.utils import get_parent
 
@@ -186,7 +188,7 @@
     obj = Acquisition.aq_inner(obj)
     base = Acquisition.aq_base(obj)
     parent = Acquisition.aq_parent(obj)
-    if not parent or isinstance(parent, RequestContainer):
+    if not parent or isinstance(parent, Application):
         return base
     return base.__of__(_rewrap(parent))
 
@@ -211,6 +213,8 @@
     the ISite) as their acquired parent.
     """
 
+    implements(IContained)
+
     def _init_registries(self):
         super(PersistentComponents, self)._init_registries()
         utilities = Acquisition.aq_base(self.utilities)



More information about the checkins mailing list