Log message for revision 80945: Moved two implements declarations from Five into the proper classes.
Changed: U Zope/trunk/doc/CHANGES.txt U Zope/trunk/lib/python/OFS/ObjectManager.py U Zope/trunk/lib/python/Products/Five/configure.zcml U Zope/trunk/lib/python/ZPublisher/HTTPRequest.py -=- Modified: Zope/trunk/doc/CHANGES.txt =================================================================== --- Zope/trunk/doc/CHANGES.txt 2007-10-20 11:37:27 UTC (rev 80944) +++ Zope/trunk/doc/CHANGES.txt 2007-10-20 13:43:09 UTC (rev 80945) @@ -9,6 +9,8 @@ Restructuring + - Moved two implements declarations from Five into the proper classes. + - Document.sequence: replaced by zope.sequencesort - All Products folders as well as the zope and zope.app folders are Modified: Zope/trunk/lib/python/OFS/ObjectManager.py =================================================================== --- Zope/trunk/lib/python/OFS/ObjectManager.py 2007-10-20 11:37:27 UTC (rev 80944) +++ Zope/trunk/lib/python/OFS/ObjectManager.py 2007-10-20 13:43:09 UTC (rev 80945) @@ -55,6 +55,8 @@ from zope.app.container.contained import ObjectAddedEvent from zope.app.container.contained import ObjectRemovedEvent from zope.app.container.contained import notifyContainerModified +from zope.app.container.interfaces import IContainer +from zope.interface import implements from OFS.event import ObjectWillBeAddedEvent from OFS.event import ObjectWillBeRemovedEvent import OFS.subscribers @@ -140,7 +142,7 @@ This class provides core behavior for collections of heterogeneous objects. """ - implements(IObjectManager) + implements(IObjectManager, IContainer) security = ClassSecurityInfo() security.declareObjectProtected(access_contents_information) Modified: Zope/trunk/lib/python/Products/Five/configure.zcml =================================================================== --- Zope/trunk/lib/python/Products/Five/configure.zcml 2007-10-20 11:37:27 UTC (rev 80944) +++ Zope/trunk/lib/python/Products/Five/configure.zcml 2007-10-20 13:43:09 UTC (rev 80945) @@ -16,13 +16,4 @@ <include package=".utilities" /> <include package=".viewlet" /> - <!-- this is really lying, but it's to please checkContainer --> - <five:implements class="OFS.ObjectManager.ObjectManager" - interface="zope.app.container.interfaces.IContainer" /> - - <!-- make Zope 2's REQUEST implement the right thing --> - <five:implements class="ZPublisher.HTTPRequest.HTTPRequest" - interface="zope.publisher.interfaces.browser.IBrowserRequest" - /> - </configure> Modified: Zope/trunk/lib/python/ZPublisher/HTTPRequest.py =================================================================== --- Zope/trunk/lib/python/ZPublisher/HTTPRequest.py 2007-10-20 11:37:27 UTC (rev 80944) +++ Zope/trunk/lib/python/ZPublisher/HTTPRequest.py 2007-10-20 13:43:09 UTC (rev 80945) @@ -27,7 +27,9 @@ from zope.i18n.interfaces import IUserPreferredLanguages from zope.i18n.locales import locales, LoadLocaleError +from zope.interface import implements from zope.publisher.base import DebugFlags +from zope.publisher.interfaces.browser import IBrowserRequest # This may get overwritten during configuration default_encoding = 'iso-8859-15' @@ -119,12 +121,15 @@ values will be looked up in the order: environment variables, other variables, form data, and then cookies. """ + implements(IBrowserRequest) + _hacked_path=None args=() _file=None _urls = () retry_max_count=3 + def supports_retry(self): if self.retry_count < self.retry_max_count: time.sleep(random.uniform(0, 2**(self.retry_count))) _______________________________________________ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins