[Zope-Checkins] SVN: Zope/branches/easter-sprint_traversal-refactor/lib/python/ZPublisher/BaseRequest.py Moved the roles checking outside the name traversal.
Log message for revision 67116: Moved the roles checking outside the name traversal. Changed: U Zope/branches/easter-sprint_traversal-refactor/lib/python/ZPublisher/BaseRequest.py -=- Modified: Zope/branches/easter-sprint_traversal-refactor/lib/python/ZPublisher/BaseRequest.py === --- Zope/branches/easter-sprint_traversal-refactor/lib/python/ZPublisher/BaseRequest.py 2006-04-19 06:48:06 UTC (rev 67115) +++ Zope/branches/easter-sprint_traversal-refactor/lib/python/ZPublisher/BaseRequest.py 2006-04-19 08:47:39 UTC (rev 67116) @@ -185,7 +185,6 @@ def traverseName(self, object, entry_name): -got = 0 URL=self['URL'] if entry_name[:1]=='_': raise Forbidden("Object name begins with an underscore at: %s" % URL) @@ -200,7 +199,6 @@ try: subobject=getattr(object, entry_name) except AttributeError: -got=1 subobject=object[entry_name] # Ensure that the object has a docstring, or that the parent @@ -227,10 +225,6 @@ "The object at %s is not publishable." % URL ) -self.roles = getRoles( -object, (not got) and entry_name or None, subobject, -self.roles) -print self.roles return subobject @@ -362,7 +356,17 @@ request['URL'] = URL = '%s/%s' % (request['URL'], step) try: -object = self.traverseName(object, entry_name) +subobject = self.traverseName(object, entry_name) +if (hasattr(object,'__bobo_traverse__') or +hasattr(object, entry_name)): +check_name = entry_name +else: +check_name = None + +self.roles = getRoles( +object, check_name, subobject, +self.roles) +object = subobject except (KeyError, AttributeError): if response.debug_mode: return response.debugError( ___ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/trunk/lib/python/zope/contentprovider/ adding external to Zope 3 zope.contentprovider package
Log message for revision 67117: adding external to Zope 3 zope.contentprovider package Changed: A Zope/trunk/lib/python/zope/contentprovider/ -=- Property changes on: Zope/trunk/lib/python/zope/contentprovider ___ Name: svn:externals + contentprovider svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/contentprovider ___ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/trunk/lib/python/zope/contentprovider/ removing wrong external (was to be added in zope top folder)
Log message for revision 67118: removing wrong external (was to be added in zope top folder) Changed: D Zope/trunk/lib/python/zope/contentprovider/ -=- ___ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/trunk/lib/python/zope/ adding contentprovider and viewlet in zope externals (Zope 3 rev: 66018)
Log message for revision 67121: adding contentprovider and viewlet in zope externals (Zope 3 rev: 66018) Changed: _U Zope/trunk/lib/python/zope/ -=- Property changes on: Zope/trunk/lib/python/zope ___ Name: svn:externals - app -r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/app cachedescriptors -r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/cachedescriptors component-r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/component configuration-r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/configuration documenttemplate -r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/documenttemplate event-r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/event exceptions -r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/exceptions hookable -r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/hookable i18n -r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/i18n i18nmessageid-r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/i18nmessageid interface-r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/interface modulealias -r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/modulealias pagetemplate -r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/pagetemplate proxy-r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/proxy publisher-r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/publisher schema -r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/schema security -r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/security server -r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/server structuredtext -r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/structuredtext tal -r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/tal tales-r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/tales testing -r 40941 svn://svn.zope.org/repos/main/zope.testing/trunk/src/zope/testing thread -r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/thread deprecation -r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/deprecation dottedname -r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/dottedname formlib -r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/formlib index-r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/index testbrowser -r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/testbrowser + app -r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/app cachedescriptors -r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/cachedescriptors component-r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/component configuration-r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/configuration documenttemplate -r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/documenttemplate event-r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/event exceptions -r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/exceptions hookable -r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/hookable i18n -r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/i18n i18nmessageid-r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/i18nmessageid interface-r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/interface modulealias -r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/modulealias pagetemplate -r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/pagetemplate proxy-r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/proxy publisher-r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/publisher schema -r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/schema security -r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/security server -r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/server structuredtext -r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/structuredtext tal -r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/tal tales-r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/tales testing -r 40941 svn://svn.zope.org/repos/main/zope.testing/trunk/src/zope/testing thread -r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/thread deprecation -r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/deprecation dottedname -r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/dottedname formlib -r 41215 svn://sv
[Zope-Checkins] SVN: Zope/trunk/releases/Zope2/DEPENDENCIES.cfg added Zope 3 dependencies
Log message for revision 67122: added Zope 3 dependencies Changed: U Zope/trunk/releases/Zope2/DEPENDENCIES.cfg -=- Modified: Zope/trunk/releases/Zope2/DEPENDENCIES.cfg === --- Zope/trunk/releases/Zope2/DEPENDENCIES.cfg 2006-04-19 10:57:49 UTC (rev 67121) +++ Zope/trunk/releases/Zope2/DEPENDENCIES.cfg 2006-04-19 11:01:26 UTC (rev 67122) @@ -63,7 +63,15 @@ zope.app.sqlscript zope.app.undo zope.app.zptpage +zope.app.intid +# zope.appkeyreference should be stated as a dependency +# in zope.app.intid/DEPENDENCIES.cfg in Zope 3 +zope.app.keyreference +zope.app.session +zope.contentprovider +zope.viewlet + # zope.app depends for us on: # - ZODB # - persistent ___ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/trunk/doc/CHANGES.txt added changes about Zope 3 missing imports
Log message for revision 67124: added changes about Zope 3 missing imports Changed: U Zope/trunk/doc/CHANGES.txt -=- Modified: Zope/trunk/doc/CHANGES.txt === --- Zope/trunk/doc/CHANGES.txt 2006-04-19 11:33:58 UTC (rev 67123) +++ Zope/trunk/doc/CHANGES.txt 2006-04-19 12:25:57 UTC (rev 67124) @@ -273,6 +273,9 @@ __dav_collection__ with a false value was overridden by isAnObjectManager. + - added missing Zope 3 imports: zope.app.intid, zope.app.keyreference, +zope.app.session, zope.contentprovider, zope.viewlet + Other - AccessControl.User: Use a better __repr__. ___ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/2.9/ backported revs 67121, 67122 and 67124 for Zope 2.9.3
Log message for revision 67125: backported revs 67121, 67122 and 67124 for Zope 2.9.3 Changed: U Zope/branches/2.9/doc/CHANGES.txt _U Zope/branches/2.9/lib/python/zope/ U Zope/branches/2.9/releases/Zope2/DEPENDENCIES.cfg -=- Modified: Zope/branches/2.9/doc/CHANGES.txt === --- Zope/branches/2.9/doc/CHANGES.txt 2006-04-19 12:25:57 UTC (rev 67124) +++ Zope/branches/2.9/doc/CHANGES.txt 2006-04-19 12:46:56 UTC (rev 67125) @@ -17,6 +17,9 @@ Zope 2.9.3 (UNRELEASED) Bugs fixed + + - Added missing Zope 3 packages: zope.app.intid, zope.app.keyreference, +zope.app.session, zope.contentprovider, zope.viewlet Zope 2.9.2 (2006/03/27) Property changes on: Zope/branches/2.9/lib/python/zope ___ Name: svn:externals - app svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/app cachedescriptors svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/cachedescriptors component svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/component configuration svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/configuration documenttemplate svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/documenttemplate event svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/event exceptions svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/exceptions hookable svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/hookable i18n svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/i18n i18nmessageid svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/i18nmessageid interface svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/interface modulealias svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/modulealias pagetemplate svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/pagetemplate proxy svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/proxy publisher svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/publisher schema svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/schema security svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/security server svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/server structuredtext svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/structuredtext tal svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/tal tales svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/tales thread svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/thread deprecation svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/deprecation dottedname svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/dottedname formlib svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/formlib index svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/index testbrowser svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/testbrowser testing -r 41141 svn://svn.zope.org/repos/main/zope.testing/trunk/src/zope/testing + app svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/app cachedescriptors svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/cachedescriptors component svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/component configuration svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/configuration documenttemplate svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/documenttemplate event svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/event exceptions svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/exceptions hookable svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/hookable i18n svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/i18n i18nmessageid svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/i18nmessageid interface svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/interface modulealias svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/modulealias pagetemplate svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/pagetemplate proxy svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/proxy publisher svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/publisher schema svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/schema security svn://svn.zope.org/repos/main/Zope3/tags/Zope-3.2.1/src/zope/security server svn://svn.zope.org/repos
[Zope-Checkins] SVN: Zope/branches/philikon-local-components/lib/python/zope/ Add new zope.* packages (that were created as a result of MakeZopeAppSmaller)
Log message for revision 67128: Add new zope.* packages (that were created as a result of MakeZopeAppSmaller) Changed: _U Zope/branches/philikon-local-components/lib/python/zope/ -=- Property changes on: Zope/branches/philikon-local-components/lib/python/zope ___ Name: svn:externals - app svn://svn.zope.org/repos/main/Zope3/branches/jim-adapter/src/zope/app cachedescriptors -r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/cachedescriptors component svn://svn.zope.org/repos/main/Zope3/branches/jim-adapter/src/zope/component configuration-r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/configuration documenttemplate -r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/documenttemplate event-r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/event exceptions -r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/exceptions hookable -r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/hookable i18n svn://svn.zope.org/repos/main/Zope3/branches/jim-adapter/src/zope/i18n i18nmessageid svn://svn.zope.org/repos/main/Zope3/branches/jim-adapter/src/zope/i18nmessageid interface svn://svn.zope.org/repos/main/Zope3/branches/jim-adapter/src/zope/interface modulealias -r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/modulealias pagetemplate -r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/pagetemplate proxy svn://svn.zope.org/repos/main/Zope3/branches/jim-adapter/src/zope/proxy publisher-r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/publisher schema -r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/schema security svn://svn.zope.org/repos/main/Zope3/branches/jim-adapter/src/zope/security server -r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/server structuredtext -r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/structuredtext tal svn://svn.zope.org/repos/main/Zope3/branches/jim-adapter/src/zope/tal tales-r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/tales testing -r 40941 svn://svn.zope.org/repos/main/zope.testing/trunk/src/zope/testing thread -r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/thread deprecation svn://svn.zope.org/repos/main/Zope3/branches/jim-adapter/src/zope/deprecation dottedname -r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/dottedname formlib svn://svn.zope.org/repos/main/Zope3/branches/jim-adapter/src/zope/formlib index-r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/index testbrowser -r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/testbrowser deferredimport svn://svn.zope.org/repos/main/Zope3/branches/jim-adapter/src/zope/deferredimport decorator svn://svn.zope.org/repos/main/Zope3/branches/jim-adapter/src/zope/decorator datetime svn://svn.zope.org/repos/main/Zope3/branches/jim-adapter/src/zope/datetime size svn://svn.zope.org/repos/main/Zope3/branches/jim-adapter/src/zope/size + app svn://svn.zope.org/repos/main/Zope3/branches/jim-adapter/src/zope/app cachedescriptors -r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/cachedescriptors component svn://svn.zope.org/repos/main/Zope3/branches/jim-adapter/src/zope/component configuration-r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/configuration documenttemplate -r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/documenttemplate event-r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/event exceptions svn://svn.zope.org/repos/main/Zope3/branches/jim-adapter/src/zope/exceptions hookable -r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/hookable i18n svn://svn.zope.org/repos/main/Zope3/branches/jim-adapter/src/zope/i18n i18nmessageid svn://svn.zope.org/repos/main/Zope3/branches/jim-adapter/src/zope/i18nmessageid interface svn://svn.zope.org/repos/main/Zope3/branches/jim-adapter/src/zope/interface modulealias -r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/modulealias pagetemplate -r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/pagetemplate proxy svn://svn.zope.org/repos/main/Zope3/branches/jim-adapter/src/zope/proxy publisher svn://svn.zope.org/repos/main/Zope3/branches/jim-adapter/src/zope/publisher schema svn://svn.zope.org/repos/main/Zope3/branches/jim-adapter/src/zope/schema security svn://svn.zope.org/repos/main/Zope3/branches/jim-adapter/src/zope/security server -r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/server structuredtext -r 41215 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/structured
[Zope-Checkins] SVN: Zope/branches/philikon-local-components/lib/python/OFS/ New import locations of things due to MakeZopeAppSmaller
Log message for revision 67129: New import locations of things due to MakeZopeAppSmaller Changed: U Zope/branches/philikon-local-components/lib/python/OFS/CopySupport.py U Zope/branches/philikon-local-components/lib/python/OFS/event.py U Zope/branches/philikon-local-components/lib/python/OFS/interfaces.py U Zope/branches/philikon-local-components/lib/python/OFS/subscribers.py -=- Modified: Zope/branches/philikon-local-components/lib/python/OFS/CopySupport.py === --- Zope/branches/philikon-local-components/lib/python/OFS/CopySupport.py 2006-04-19 13:47:40 UTC (rev 67128) +++ Zope/branches/philikon-local-components/lib/python/OFS/CopySupport.py 2006-04-19 13:50:58 UTC (rev 67129) @@ -37,7 +37,7 @@ from ZODB.POSException import ConflictError from zope.interface import implements from zope.event import notify -from zope.app.event.objectevent import ObjectCopiedEvent +from zope.lifecycleevent import ObjectCopiedEvent from zope.app.container.contained import ObjectMovedEvent from zope.app.container.contained import notifyContainerModified from OFS.event import ObjectWillBeMovedEvent Modified: Zope/branches/philikon-local-components/lib/python/OFS/event.py === --- Zope/branches/philikon-local-components/lib/python/OFS/event.py 2006-04-19 13:47:40 UTC (rev 67128) +++ Zope/branches/philikon-local-components/lib/python/OFS/event.py 2006-04-19 13:50:58 UTC (rev 67129) @@ -18,7 +18,7 @@ """ from zope.interface import implements -from zope.app.event.objectevent import ObjectEvent +from zope.component.interfaces import ObjectEvent import OFS.interfaces Modified: Zope/branches/philikon-local-components/lib/python/OFS/interfaces.py === --- Zope/branches/philikon-local-components/lib/python/OFS/interfaces.py 2006-04-19 13:47:40 UTC (rev 67128) +++ Zope/branches/philikon-local-components/lib/python/OFS/interfaces.py 2006-04-19 13:50:58 UTC (rev 67129) @@ -27,7 +27,7 @@ from webdav.interfaces import IDAVCollection from webdav.interfaces import IDAVResource -from zope.app.traversing.interfaces import IContainmentRoot +from zope.traversing.interfaces import IContainmentRoot from zope.app.component.interfaces import IPossibleSite class IOrderedContainer(Interface): @@ -903,7 +903,7 @@ ## # Event interfaces -from zope.app.event.interfaces import IObjectEvent +from zope.component.interfaces import IObjectEvent class IObjectWillBeMovedEvent(IObjectEvent): """An object will be moved.""" Modified: Zope/branches/philikon-local-components/lib/python/OFS/subscribers.py === --- Zope/branches/philikon-local-components/lib/python/OFS/subscribers.py 2006-04-19 13:47:40 UTC (rev 67128) +++ Zope/branches/philikon-local-components/lib/python/OFS/subscribers.py 2006-04-19 13:50:58 UTC (rev 67129) @@ -29,8 +29,8 @@ from zope.interface import implements from zope.component import adapts +from zope.location.interfaces import ISublocations from zope.app.container.contained import dispatchToSublocations -from zope.app.location.interfaces import ISublocations deprecatedManageAddDeleteClasses = [] ___ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/philikon-local-components/lib/python/OFS/content_types.py content_types has move (again) to zope.contenttype
Log message for revision 67130: content_types has move (again) to zope.contenttype Changed: U Zope/branches/philikon-local-components/lib/python/OFS/content_types.py -=- Modified: Zope/branches/philikon-local-components/lib/python/OFS/content_types.py === --- Zope/branches/philikon-local-components/lib/python/OFS/content_types.py 2006-04-19 13:50:58 UTC (rev 67129) +++ Zope/branches/philikon-local-components/lib/python/OFS/content_types.py 2006-04-19 13:52:18 UTC (rev 67130) @@ -14,11 +14,10 @@ $Id$ """ - import warnings warnings.warn('Using OFS.content_types is deprecated (will be removed in Zope ' - '2.11). Instead use zope.app.contenttypes.', + '2.11). Instead use zope.contenttype.', DeprecationWarning, stacklevel=2) -from zope.app.contenttypes import text_type, guess_content_type, add_files +from zope.contenttype import text_type, guess_content_type, add_files ___ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Products.Five/branches/philikon-local-components/browser/__init__.py New import location due to MakeZopeAppSmaller
Log message for revision 67131: New import location due to MakeZopeAppSmaller Changed: U Products.Five/branches/philikon-local-components/browser/__init__.py -=- Modified: Products.Five/branches/philikon-local-components/browser/__init__.py === --- Products.Five/branches/philikon-local-components/browser/__init__.py 2006-04-19 13:52:18 UTC (rev 67130) +++ Products.Five/branches/philikon-local-components/browser/__init__.py 2006-04-19 13:53:43 UTC (rev 67131) @@ -16,9 +16,9 @@ $Id$ """ import Acquisition -import zope.app.publisher.browser +import zope.publisher.browser -class BrowserView(Acquisition.Explicit, zope.app.publisher.browser.BrowserView): +class BrowserView(Acquisition.Explicit, zope.publisher.browser.BrowserView): """Five browser view Mixes in explicit acquisition so that security can be acquired for ___ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/philikon-local-components/lib/python/App/ImageFile.py New import location of zope.app.contenttypes/zope.app.content_types.
Log message for revision 67132: New import location of zope.app.contenttypes/zope.app.content_types. Changed: U Zope/branches/philikon-local-components/lib/python/App/ImageFile.py -=- Modified: Zope/branches/philikon-local-components/lib/python/App/ImageFile.py === --- Zope/branches/philikon-local-components/lib/python/App/ImageFile.py 2006-04-19 13:53:43 UTC (rev 67131) +++ Zope/branches/philikon-local-components/lib/python/App/ImageFile.py 2006-04-19 13:57:45 UTC (rev 67132) @@ -26,7 +26,7 @@ from Common import rfc1123_date from DateTime import DateTime -from zope.app.contenttypes import guess_content_type +from zope.contenttype import guess_content_type class ImageFile(Acquisition.Explicit): """Image objects stored in external files.""" ___ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/philikon-local-components/lib/python/ New import location of zope.app.contenttypes/zope.app.content_types.
Log message for revision 67133: New import location of zope.app.contenttypes/zope.app.content_types. Changed: U Zope/branches/philikon-local-components/lib/python/OFS/DTMLDocument.py U Zope/branches/philikon-local-components/lib/python/OFS/DTMLMethod.py U Zope/branches/philikon-local-components/lib/python/OFS/Image.py U Zope/branches/philikon-local-components/lib/python/Products/PageTemplates/ZopePageTemplate.py U Zope/branches/philikon-local-components/lib/python/ZClasses/Method.py U Zope/branches/philikon-local-components/lib/python/Zope2/Startup/handlers.py U Zope/branches/philikon-local-components/lib/python/webdav/NullResource.py -=- Modified: Zope/branches/philikon-local-components/lib/python/OFS/DTMLDocument.py === --- Zope/branches/philikon-local-components/lib/python/OFS/DTMLDocument.py 2006-04-19 13:57:45 UTC (rev 67132) +++ Zope/branches/philikon-local-components/lib/python/OFS/DTMLDocument.py 2006-04-19 14:01:59 UTC (rev 67133) @@ -17,7 +17,7 @@ from Globals import InitializeClass from ZPublisher.Converters import type_converters from Globals import HTML, DTMLFile, MessageDialog -from zope.app.contenttypes import guess_content_type +from zope.contenttype import guess_content_type from DTMLMethod import DTMLMethod, decapitate from PropertyManager import PropertyManager from webdav.common import rfc1123_date Modified: Zope/branches/philikon-local-components/lib/python/OFS/DTMLMethod.py === --- Zope/branches/philikon-local-components/lib/python/OFS/DTMLMethod.py 2006-04-19 13:57:45 UTC (rev 67132) +++ Zope/branches/philikon-local-components/lib/python/OFS/DTMLMethod.py 2006-04-19 14:01:59 UTC (rev 67133) @@ -18,7 +18,7 @@ from Globals import HTML, DTMLFile, MessageDialog from Globals import InitializeClass from SimpleItem import Item_w__name__, pretty_tb -from zope.app.contenttypes import guess_content_type +from zope.contenttype import guess_content_type from PropertyManager import PropertyManager from AccessControl import ClassSecurityInfo from AccessControl.Role import RoleManager Modified: Zope/branches/philikon-local-components/lib/python/OFS/Image.py === --- Zope/branches/philikon-local-components/lib/python/OFS/Image.py 2006-04-19 13:57:45 UTC (rev 67132) +++ Zope/branches/philikon-local-components/lib/python/OFS/Image.py 2006-04-19 14:01:59 UTC (rev 67133) @@ -15,7 +15,7 @@ $Id$ """ import struct -from zope.app.contenttypes import guess_content_type +from zope.contenttype import guess_content_type from Globals import DTMLFile from Globals import InitializeClass from PropertyManager import PropertyManager Modified: Zope/branches/philikon-local-components/lib/python/Products/PageTemplates/ZopePageTemplate.py === --- Zope/branches/philikon-local-components/lib/python/Products/PageTemplates/ZopePageTemplate.py 2006-04-19 13:57:45 UTC (rev 67132) +++ Zope/branches/philikon-local-components/lib/python/Products/PageTemplates/ZopePageTemplate.py 2006-04-19 14:01:59 UTC (rev 67133) @@ -20,7 +20,7 @@ import Acquisition from Globals import ImageFile, package_home, InitializeClass from OFS.SimpleItem import SimpleItem -from zope.app.contenttypes import guess_content_type +from zope.contenttype import guess_content_type from DateTime.DateTime import DateTime from Shared.DC.Scripts.Script import Script from Shared.DC.Scripts.Signature import FuncCode Modified: Zope/branches/philikon-local-components/lib/python/ZClasses/Method.py === --- Zope/branches/philikon-local-components/lib/python/ZClasses/Method.py 2006-04-19 13:57:45 UTC (rev 67132) +++ Zope/branches/philikon-local-components/lib/python/ZClasses/Method.py 2006-04-19 14:01:59 UTC (rev 67133) @@ -25,7 +25,7 @@ import marshal from cgi import escape -from zope.app.contenttypes import guess_content_type +from zope.contenttype import guess_content_type _marker=[] class ZClassMethodsSheet( Modified: Zope/branches/philikon-local-components/lib/python/Zope2/Startup/handlers.py === --- Zope/branches/philikon-local-components/lib/python/Zope2/Startup/handlers.py 2006-04-19 13:57:45 UTC (rev 67132) +++ Zope/branches/philikon-local-components/lib/python/Zope2/Startup/handlers.py 2006-04-19 14:01:59 UTC (rev 67133) @@ -175,7 +175,7 @@ # Augment the set of MIME types: if config.mime_types: -from zope.app.contenttypes import add_files +from zope.contenttype import add_files add_files(config.mime_types) # if no servers are defined, create default http server and ftp server Modifie
[Zope-Checkins] SVN: Zope/branches/easter-sprint_twistedserver/ create new branch to contain the integration with the
Log message for revision 67143: create new branch to contain the integration with the Twisted server. Changed: A Zope/branches/easter-sprint_twistedserver/ -=- Copied: Zope/branches/easter-sprint_twistedserver (from rev 67142, Zope/trunk) ___ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Products.Five/branches/philikon-local-components/meta.zcml - import fix
Log message for revision 67144: - import fix Changed: U Products.Five/branches/philikon-local-components/meta.zcml -=- Modified: Products.Five/branches/philikon-local-components/meta.zcml === --- Products.Five/branches/philikon-local-components/meta.zcml 2006-04-19 16:14:04 UTC (rev 67143) +++ Products.Five/branches/philikon-local-components/meta.zcml 2006-04-19 16:18:41 UTC (rev 67144) @@ -8,11 +8,10 @@ http://namespaces.zope.org/zope";> - http://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Products.Five/branches/philikon-local-components/site/configure.zcml - import fix
Log message for revision 67145: - import fix Changed: U Products.Five/branches/philikon-local-components/site/configure.zcml -=- Modified: Products.Five/branches/philikon-local-components/site/configure.zcml === --- Products.Five/branches/philikon-local-components/site/configure.zcml 2006-04-19 16:18:41 UTC (rev 67144) +++ Products.Five/branches/philikon-local-components/site/configure.zcml 2006-04-19 16:21:42 UTC (rev 67145) @@ -2,7 +2,7 @@ xmlns:browser="http://namespaces.zope.org/browser";> ___ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/publication-refactor/lib/python/ Twisted working with new publisher and old Request and Response objects.
Log message for revision 67146: Twisted working with new publisher and old Request and Response objects. Changed: U Zope/branches/publication-refactor/lib/python/OFS/Application.py U Zope/branches/publication-refactor/lib/python/ZPublisher/HTTPRequest.py U Zope/branches/publication-refactor/lib/python/ZPublisher/Publication.py U Zope/branches/publication-refactor/lib/python/Zope2/Startup/__init__.py -=- Modified: Zope/branches/publication-refactor/lib/python/OFS/Application.py === --- Zope/branches/publication-refactor/lib/python/OFS/Application.py 2006-04-19 16:21:42 UTC (rev 67145) +++ Zope/branches/publication-refactor/lib/python/OFS/Application.py 2006-04-19 16:31:45 UTC (rev 67146) @@ -117,7 +117,6 @@ Redirect = ZopeRedirect = PrincipiaRedirect def __bobo_traverse__(self, REQUEST, name=None): - try: return getattr(self, name) except AttributeError: pass try: return self[name] Modified: Zope/branches/publication-refactor/lib/python/ZPublisher/HTTPRequest.py === --- Zope/branches/publication-refactor/lib/python/ZPublisher/HTTPRequest.py 2006-04-19 16:21:42 UTC (rev 67145) +++ Zope/branches/publication-refactor/lib/python/ZPublisher/HTTPRequest.py 2006-04-19 16:31:45 UTC (rev 67146) @@ -1072,6 +1072,8 @@ clone['PARENTS']=[self['PARENTS'][-1]] return clone +# XXX This is called getHeader in Response, and in Zope3 request. +# We should probably rename this getHeader and deprecate this. def get_header(self, name, default=None): """Return the named HTTP header, or an optional default argument or None if the header is not found. Note that Modified: Zope/branches/publication-refactor/lib/python/ZPublisher/Publication.py === --- Zope/branches/publication-refactor/lib/python/ZPublisher/Publication.py 2006-04-19 16:21:42 UTC (rev 67145) +++ Zope/branches/publication-refactor/lib/python/ZPublisher/Publication.py 2006-04-19 16:31:45 UTC (rev 67146) @@ -92,8 +92,11 @@ # Now, some code from ZPublisher.BaseRequest: # If the top object has a __bobo_traverse__ method, then use it # to possibly traverse to an alternate top-level object. -if hasattr(ob, '__bobo_traverse__'): -ob = ob.__bobo_traverse__(request) +try: +if hasattr(ob, '__bobo_traverse__'): +ob = ob.__bobo_traverse__(request) +except: +pass if hasattr(ob, '__of__'): # Try to bind the top-level object to the request @@ -170,6 +173,8 @@ sys.exc_info()[1], sys.exc_info()[2], ) +except: +return request.response.exception() finally: self._abort() @@ -255,6 +260,10 @@ class Zope2BrowserRequest(BrowserRequest): +# Zope 2 compatibility XXX Deprecate! +def get_header(self, name, default=None): +return self.getHeader(name, default) + def __init__(self, *args, **kw): self.other = {'PARENTS':[]} self._lazies = {} @@ -283,7 +292,7 @@ return v def traverse(self, object): -ob = super(BrowserRequest, self).traverse(object) +ob = super(Zope2BrowserRequest, self).traverse(object) self.other['PARENTS'].append(ob) return ob @@ -326,7 +335,7 @@ if pathonly: path = [''] + path[:n] else: -path = [other['SERVER_URL']] + path[:n] +path = [self['SERVER_URL']] + path[:n] URL = '/'.join(path) if other.has_key('PUBLISHED'): # Don't cache URLs until publishing traversal is done. @@ -390,8 +399,76 @@ if v is not _marker: return v return default + +from ZPublisher.HTTPRequest import HTTPRequest +from ZPublisher.HTTPResponse import HTTPResponse +from cStringIO import StringIO +import traceback +from zope.publisher.http import status_reasons, DirectResult +class Zope2HTTPResponse(HTTPResponse): + +def setResult(self, result): +"""Sets the response result value. +""" +self.setBody(result) +def handleException(self, exc_info): +"""Handles an otherwise unhandled exception. + +The publication object gets the first chance to handle an exception, +and if it doesn't have a good way to do it, it defers to the +response. Implementations should set the reponse body. +""" +f = StringIO() +traceback.print_exception( +exc_info[0]. exc_info[1], exc_info[2], 100, f) +self.setResult(f.getvalue()) + +def int
[Zope-Checkins] SVN: Products.Five/branches/philikon-local-components/meta Add missing directive and deprecate
Log message for revision 67149: Add missing directive and deprecate Changed: U Products.Five/branches/philikon-local-components/meta.zcml U Products.Five/branches/philikon-local-components/metaconfigure.py -=- Modified: Products.Five/branches/philikon-local-components/meta.zcml === --- Products.Five/branches/philikon-local-components/meta.zcml 2006-04-19 16:55:18 UTC (rev 67148) +++ Products.Five/branches/philikon-local-components/meta.zcml 2006-04-19 17:13:06 UTC (rev 67149) @@ -51,6 +51,30 @@ /> + + + + + + + + + + +http://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Products.Five/branches/philikon-local-components/ lots and lots of new import paths
Log message for revision 67150: lots and lots of new import paths Changed: U Products.Five/branches/philikon-local-components/browser/absoluteurl.py U Products.Five/branches/philikon-local-components/browser/adding.py U Products.Five/branches/philikon-local-components/browser/configure.zcml U Products.Five/branches/philikon-local-components/browser/metaconfigure.py U Products.Five/branches/philikon-local-components/browser/resource.py U Products.Five/branches/philikon-local-components/browser/tests/test_absoluteurl.py U Products.Five/branches/philikon-local-components/component/browser.py U Products.Five/branches/philikon-local-components/fiveconfigure.py U Products.Five/branches/philikon-local-components/fivedirectives.py U Products.Five/branches/philikon-local-components/site/tests/test_localsite.py U Products.Five/branches/philikon-local-components/sizeconfigure.py U Products.Five/branches/philikon-local-components/tests/test_size.py U Products.Five/branches/philikon-local-components/traversable.py U Products.Five/branches/philikon-local-components/traversing.zcml -=- Modified: Products.Five/branches/philikon-local-components/browser/absoluteurl.py === --- Products.Five/branches/philikon-local-components/browser/absoluteurl.py 2006-04-19 17:13:06 UTC (rev 67149) +++ Products.Five/branches/philikon-local-components/browser/absoluteurl.py 2006-04-19 17:23:29 UTC (rev 67150) @@ -20,14 +20,14 @@ from zope.interface import implements from zope.component import getMultiAdapter -from zope.app.traversing.browser.interfaces import IAbsoluteURL +from zope.traversing.browser.interfaces import IAbsoluteURL from Products.Five.browser import BrowserView class AbsoluteURL(BrowserView): """An adapter for Zope3-style absolute_url using Zope2 methods -(original: zope.app.traversing.browser.absoluteurl) +(original: zope.traversing.browser.absoluteurl) """ implements(IAbsoluteURL) @@ -72,7 +72,7 @@ This one is just used to stop breadcrumbs from crumbing up to the Zope root. -(original: zope.app.traversing.browser.absoluteurl) +(original: zope.traversing.browser.absoluteurl) """ def breadcrumbs(self): Modified: Products.Five/branches/philikon-local-components/browser/adding.py === --- Products.Five/branches/philikon-local-components/browser/adding.py 2006-04-19 17:13:06 UTC (rev 67149) +++ Products.Five/branches/philikon-local-components/browser/adding.py 2006-04-19 17:23:29 UTC (rev 67150) @@ -25,13 +25,13 @@ from zope.publisher.interfaces import IPublishTraverse from zope.component.interfaces import IFactory from zope.event import notify +from zope.exceptions import UserError +from zope.lifecycleevent import ObjectCreatedEvent -from zope.app.exception.interfaces import UserError from zope.app.container.interfaces import IAdding, INameChooser from zope.app.container.interfaces import IContainerNamesContainer from zope.app.container.constraints import checkFactory, checkObject from zope.app.publisher.browser.menu import getMenu -from zope.app.event.objectevent import ObjectCreatedEvent from Acquisition import Implicit from zExceptions import BadRequest Modified: Products.Five/branches/philikon-local-components/browser/configure.zcml === --- Products.Five/branches/philikon-local-components/browser/configure.zcml 2006-04-19 17:13:06 UTC (rev 67149) +++ Products.Five/branches/philikon-local-components/browser/configure.zcml 2006-04-19 17:23:29 UTC (rev 67150) @@ -25,7 +25,7 @@ name="absolute_url" class=".absoluteurl.AbsoluteURL" permission="zope.Public" - allowed_interface="zope.app.traversing.browser.interfaces.IAbsoluteURL" + allowed_interface="zope.traversing.browser.interfaces.IAbsoluteURL" /> >> from zope.interface import directlyProvides, providedBy - >>> from zope.app.traversing.interfaces import IContainmentRoot + >>> from zope.traversing.interfaces import IContainmentRoot >>> directlyProvides(self.folder, IContainmentRoot) >>> for crumb in view.breadcrumbs(): Modified: Products.Five/branches/philikon-local-components/component/browser.py === --- Products.Five/branches/philikon-local-components/component/browser.py 2006-04-19 17:13:06 UTC (rev 67149) +++ Products.Five/branches/philikon-local-components/component/browser.py 2006-04-19 17:23:29 UTC (rev 67150) @@ -30,9 +30,9 @@ from zope.component.globalregistry import base from zope.component.persistentregistry import PersistentComponents from zope.publisher.interfaces.browser import IBrowserRequest +from zope.traversing.browser import absolute
[Zope-Checkins] SVN: Products.Five/branches/philikon-local-components/ Some more new import paths
Log message for revision 67151: Some more new import paths Changed: U Products.Five/branches/philikon-local-components/component/component.txt U Products.Five/branches/philikon-local-components/event.zcml U Products.Five/branches/philikon-local-components/form/__init__.py U Products.Five/branches/philikon-local-components/formlib/formbase.py U Products.Five/branches/philikon-local-components/tests/event.txt -=- Modified: Products.Five/branches/philikon-local-components/component/component.txt === --- Products.Five/branches/philikon-local-components/component/component.txt 2006-04-19 17:23:29 UTC (rev 67150) +++ Products.Five/branches/philikon-local-components/component/component.txt 2006-04-19 17:27:04 UTC (rev 67151) @@ -47,7 +47,7 @@ The adapter also works using the ``ILocation`` API by inspecting the ``__parent__`` object instead of using the acquisition parent: - >>> from zope.app.location import Location + >>> from zope.location import Location >>> ob = Location() >>> ob2 = Location() >>> ob.__parent__ = site Modified: Products.Five/branches/philikon-local-components/event.zcml === --- Products.Five/branches/philikon-local-components/event.zcml 2006-04-19 17:23:29 UTC (rev 67150) +++ Products.Five/branches/philikon-local-components/event.zcml 2006-04-19 17:27:04 UTC (rev 67151) @@ -8,7 +8,7 @@ Modified: Products.Five/branches/philikon-local-components/form/__init__.py === --- Products.Five/branches/philikon-local-components/form/__init__.py 2006-04-19 17:23:29 UTC (rev 67150) +++ Products.Five/branches/philikon-local-components/form/__init__.py 2006-04-19 17:27:04 UTC (rev 67151) @@ -21,18 +21,18 @@ import Acquisition import transaction from zope.event import notify +from zope.lifecycleevent import ObjectCreatedEvent, ObjectModifiedEvent +from zope.location.interfaces import ILocation +from zope.location import LocationProxy from zope.schema.interfaces import ValidationError from zope.i18nmessageid import MessageFactory _ = MessageFactory('zope') -from zope.app.location.interfaces import ILocation -from zope.app.location import LocationProxy from zope.app.form.utility import setUpEditWidgets, applyWidgetsChanges from zope.app.form.browser.submit import Update from zope.app.form.interfaces import WidgetsError, MissingInputError from zope.app.form.utility import setUpWidgets, getWidgetsData from zope.app.form.interfaces import IInputWidget, WidgetsError -from zope.app.event.objectevent import ObjectCreatedEvent, ObjectModifiedEvent from Products.Five.browser import BrowserView from Products.Five.browser.decode import processInputs, setPageEncoding Modified: Products.Five/branches/philikon-local-components/formlib/formbase.py === --- Products.Five/branches/philikon-local-components/formlib/formbase.py 2006-04-19 17:23:29 UTC (rev 67150) +++ Products.Five/branches/philikon-local-components/formlib/formbase.py 2006-04-19 17:27:04 UTC (rev 67151) @@ -19,7 +19,7 @@ import Acquisition import zope.event -import zope.app.event.objectevent +import zope.lifecycleevent from zope import interface from zope.formlib import interfaces, form, namedtemplate from zope.formlib.i18n import _ @@ -59,7 +59,7 @@ self.context, self.form_fields, data, self.adapters): zope.event.notify( -zope.app.event.objectevent.ObjectModifiedEvent(self.context) +zope.lifecycleevent.ObjectModifiedEvent(self.context) ) # TODO: Needs locale support. See also Five.form.EditView. self.status = _( Modified: Products.Five/branches/philikon-local-components/tests/event.txt === --- Products.Five/branches/philikon-local-components/tests/event.txt 2006-04-19 17:23:29 UTC (rev 67150) +++ Products.Five/branches/philikon-local-components/tests/event.txt 2006-04-19 17:27:04 UTC (rev 67151) @@ -58,7 +58,7 @@ framework's ones, so ours will be called first. This has the effect that printed events will be in their "natural" order:: - >>> from zope.app.event.interfaces import IObjectEvent + >>> from zope.component.interfaces import IObjectEvent >>> from zope.app.container.interfaces import IObjectMovedEvent >>> from OFS.interfaces import IObjectWillBeMovedEvent >>> from OFS.interfaces import IObjectClonedEvent ___ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/publication-refactor/lib/python/ZServer/HTTPResponse.py return the response from the setBody method. This is what the handleException
Log message for revision 67152: return the response from the setBody method. This is what the handleException method expects to happen, and what setBody does if we return a stream. Changed: U Zope/branches/publication-refactor/lib/python/ZServer/HTTPResponse.py -=- Modified: Zope/branches/publication-refactor/lib/python/ZServer/HTTPResponse.py === --- Zope/branches/publication-refactor/lib/python/ZServer/HTTPResponse.py 2006-04-19 17:27:04 UTC (rev 67151) +++ Zope/branches/publication-refactor/lib/python/ZServer/HTTPResponse.py 2006-04-19 17:28:54 UTC (rev 67152) @@ -251,6 +251,7 @@ return self else: HTTPResponse.setBody(self, body, title, is_error, **kw) +return self class ChannelPipe: """Experimental pipe from ZPublisher to a ZServer Channel. ___ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Products.Five/branches/philikon-local-components/component/zpt.txt put this back
Log message for revision 67153: put this back Changed: U Products.Five/branches/philikon-local-components/component/zpt.txt -=- Modified: Products.Five/branches/philikon-local-components/component/zpt.txt === --- Products.Five/branches/philikon-local-components/component/zpt.txt 2006-04-19 17:28:54 UTC (rev 67152) +++ Products.Five/branches/philikon-local-components/component/zpt.txt 2006-04-19 17:32:56 UTC (rev 67153) @@ -28,7 +28,7 @@ >>> import zope.app.event >>> zcml.load_config('meta.zcml', Products.Five) >>> zcml.load_config('permissions.zcml', Products.Five) - #>>> zcml.load_config('traversing.zcml', Products.Five) + >>> zcml.load_config('traversing.zcml', Products.Five) >>> zcml.load_config('configure.zcml', Products.Five.component) >>> zcml.load_config('configure.zcml', zope.app.event) ___ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Products.Five/branches/philikon-local-components/utilities/ new import paths
Log message for revision 67154: new import paths Changed: U Products.Five/branches/philikon-local-components/utilities/browser/tests/test_marker.py U Products.Five/branches/philikon-local-components/utilities/marker.py -=- Modified: Products.Five/branches/philikon-local-components/utilities/browser/tests/test_marker.py === --- Products.Five/branches/philikon-local-components/utilities/browser/tests/test_marker.py 2006-04-19 17:32:56 UTC (rev 67153) +++ Products.Five/branches/philikon-local-components/utilities/browser/tests/test_marker.py 2006-04-19 17:33:15 UTC (rev 67154) @@ -60,7 +60,7 @@ >>> from Products.Five.tests.testing.simplecontent import ISimpleContent >>> class IFooMarker(ISimpleContent): pass - >>> from zope.app.component.interface import provideInterface + >>> from zope.component.interface import provideInterface >>> provideInterface('', IFooMarker) >>> view.getAvailableInterfaceNames() [...IFooMarker...] Modified: Products.Five/branches/philikon-local-components/utilities/marker.py === --- Products.Five/branches/philikon-local-components/utilities/marker.py 2006-04-19 17:32:56 UTC (rev 67153) +++ Products.Five/branches/philikon-local-components/utilities/marker.py 2006-04-19 17:33:15 UTC (rev 67154) @@ -19,14 +19,11 @@ """ from sets import Set -from zope.interface import implements -from zope.interface import implementedBy -from zope.interface import directlyProvidedBy -from zope.interface import directlyProvides -from zope.interface import providedBy +from zope.interface import implements, implementedBy, providedBy +from zope.interface import directlyProvides, directlyProvidedBy from zope.interface.interfaces import IInterface -from zope.app.component.interface import getInterface, interfaceToName -from zope.app.component.interface import searchInterface +from zope.component.interface import getInterface, interfaceToName +from zope.component.interface import searchInterface from interfaces import IMarkerInterfaces ___ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/easter-sprint_twistedserver/ We will use the publication_refactor branch for this work instead:
Log message for revision 67155: We will use the publication_refactor branch for this work instead: Changed: D Zope/branches/easter-sprint_twistedserver/ -=- ___ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Products.Five/branches/philikon-local-components/metaconfigure.py added missing import
Log message for revision 67156: added missing import Changed: U Products.Five/branches/philikon-local-components/metaconfigure.py -=- Modified: Products.Five/branches/philikon-local-components/metaconfigure.py === --- Products.Five/branches/philikon-local-components/metaconfigure.py 2006-04-19 17:34:11 UTC (rev 67155) +++ Products.Five/branches/philikon-local-components/metaconfigure.py 2006-04-19 17:34:21 UTC (rev 67156) @@ -15,6 +15,7 @@ $Id$ """ +import warnings from Products.Five.security import CheckerPublic, protectName from Globals import InitializeClass as initializeClass import zope.app.component.contentdirective ___ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Products.Five/branches/philikon-local-components/tests/test_i18n.py fix a test and reduce testing dependencies
Log message for revision 67157: fix a test and reduce testing dependencies Changed: U Products.Five/branches/philikon-local-components/tests/test_i18n.py -=- Modified: Products.Five/branches/philikon-local-components/tests/test_i18n.py === --- Products.Five/branches/philikon-local-components/tests/test_i18n.py 2006-04-19 17:34:21 UTC (rev 67156) +++ Products.Five/branches/philikon-local-components/tests/test_i18n.py 2006-04-19 17:42:50 UTC (rev 67157) @@ -23,14 +23,14 @@ """ Test the i18n directive - >>> from zope.app.testing.placelesssetup import setUp, tearDown + >>> from zope.component.testing import setUp, tearDown >>> setUp() First, we need to register the ZCML directive: - >>> import zope.app.i18n + >>> import zope.i18n >>> from Products.Five import zcml - >>> zcml.load_config('meta.zcml', zope.app.i18n) + >>> zcml.load_config('meta.zcml', zope.i18n) Let's register the gettext locales using the ZCML directive: ___ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Products.Five/branches/philikon-local-components/traversable.py new improt paths
Log message for revision 67158: new improt paths Changed: U Products.Five/branches/philikon-local-components/traversable.py -=- Modified: Products.Five/branches/philikon-local-components/traversable.py === --- Products.Five/branches/philikon-local-components/traversable.py 2006-04-19 17:42:50 UTC (rev 67157) +++ Products.Five/branches/philikon-local-components/traversable.py 2006-04-19 17:43:42 UTC (rev 67158) @@ -21,11 +21,10 @@ from zope.interface import implements, Interface from zope.publisher.interfaces import ILayer from zope.publisher.interfaces.browser import IBrowserRequest +from zope.publisher.browser import setDefaultSkin from zope.traversing.interfaces import ITraverser, ITraversable from zope.traversing.adapters import DefaultTraversable from zope.traversing.adapters import traversePathElement - -from zope.app.publication.browser import setDefaultSkin from zope.app.interface import queryType from AccessControl import getSecurityManager ___ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Products.Five/branches/philikon-local-components/meta.zcml Get rid of a lot of custom registration code; we can now reuse the
Log message for revision 67159: Get rid of a lot of custom registration code; we can now reuse the very modular meta.zcml files from the various zope.* packages. Changed: U Products.Five/branches/philikon-local-components/meta.zcml -=- Modified: Products.Five/branches/philikon-local-components/meta.zcml === --- Products.Five/branches/philikon-local-components/meta.zcml 2006-04-19 17:43:42 UTC (rev 67158) +++ Products.Five/branches/philikon-local-components/meta.zcml 2006-04-19 17:44:19 UTC (rev 67159) @@ -2,6 +2,13 @@ xmlns="http://namespaces.zope.org/zope"; xmlns:meta="http://namespaces.zope.org/meta";> + + + + + + + @@ -9,42 +16,13 @@ http://namespaces.zope.org/zope";> - - - - + - - - - - - + - http://namespaces.zope.org/meta"; - schema="zope.security.zcml.IRedefinePermission" - handler="zope.security.zcml.redefinePermission" - /> - - - - - - - ___ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Products.Five/branches/philikon-local-components/tests/test_i18n.py don't even use zopetestcase (die, bitch, die)
Log message for revision 67160: don't even use zopetestcase (die, bitch, die) cosmetics on test setup Changed: U Products.Five/branches/philikon-local-components/tests/test_i18n.py -=- Modified: Products.Five/branches/philikon-local-components/tests/test_i18n.py === --- Products.Five/branches/philikon-local-components/tests/test_i18n.py 2006-04-19 17:44:19 UTC (rev 67159) +++ Products.Five/branches/philikon-local-components/tests/test_i18n.py 2006-04-19 17:48:42 UTC (rev 67160) @@ -19,15 +19,13 @@ if __name__ == '__main__': execfile(os.path.join(sys.path[0], 'framework.py')) +from zope.component.testing import setUp, tearDown + def test_directive(): """ -Test the i18n directive +Test the i18n directive. First, we need to register the ZCML +directive: - >>> from zope.component.testing import setUp, tearDown - >>> setUp() - -First, we need to register the ZCML directive: - >>> import zope.i18n >>> from Products.Five import zcml >>> zcml.load_config('meta.zcml', zope.i18n) @@ -56,16 +54,11 @@ u'This is an explicit message' >>> translate(msg, target_language='de') u'Dies ist eine explizite Nachricht' - - -Clean up: - - >>> tearDown() """ def test_suite(): -from Testing.ZopeTestCase import ZopeDocTestSuite -return ZopeDocTestSuite() +from zope.testing.doctest import DocTestSuite +return DocTestSuite(setUp=setUp, tearDown=tearDown) if __name__ == '__main__': framework() ___ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Products.Five/branches/philikon-local-components/tests/event.txt zope.component/meta.zcml is enough these days
Log message for revision 67161: zope.component/meta.zcml is enough these days Changed: U Products.Five/branches/philikon-local-components/tests/event.txt -=- Modified: Products.Five/branches/philikon-local-components/tests/event.txt === --- Products.Five/branches/philikon-local-components/tests/event.txt 2006-04-19 17:48:42 UTC (rev 67160) +++ Products.Five/branches/philikon-local-components/tests/event.txt 2006-04-19 17:51:30 UTC (rev 67161) @@ -82,8 +82,8 @@ >>> from Products.Five import zcml >>> import Products.Five - >>> import zope.app.component - >>> zcml.load_config('meta.zcml', zope.app.component) + >>> import zope.component + >>> zcml.load_config('meta.zcml', zope.component) >>> zcml.load_config('event.zcml', Products.Five) We need at least one fake deprecated method to tell the compatibility ___ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/philikon-local-components/lib/python/OFS/subscribers.py add adapter() declarations so that these are easier to register
Log message for revision 67162: add adapter() declarations so that these are easier to register Changed: U Zope/branches/philikon-local-components/lib/python/OFS/subscribers.py -=- Modified: Zope/branches/philikon-local-components/lib/python/OFS/subscribers.py === --- Zope/branches/philikon-local-components/lib/python/OFS/subscribers.py 2006-04-19 17:51:30 UTC (rev 67161) +++ Zope/branches/philikon-local-components/lib/python/OFS/subscribers.py 2006-04-19 18:04:21 UTC (rev 67162) @@ -21,18 +21,18 @@ import sys from logging import getLogger +import OFS.interfaces from Acquisition import aq_base from App.config import getConfiguration from AccessControl import getSecurityManager from ZODB.POSException import ConflictError -import OFS.interfaces -from zope.interface import implements -from zope.component import adapts -from zope.location.interfaces import ISublocations +import zope.component +import zope.interface +import zope.location.interfaces from zope.app.container.contained import dispatchToSublocations +from zope.app.container.interfaces import IObjectMovedEvent - deprecatedManageAddDeleteClasses = [] LOG = getLogger('OFS.subscribers') @@ -79,8 +79,8 @@ class ObjectManagerSublocations(object): """Get the sublocations for an ObjectManager. """ -adapts(OFS.interfaces.IObjectManager) -implements(ISublocations) +zope.component.adapts(OFS.interfaces.IObjectManager) +zope.interface.implements(zope.location.interfaces.ISublocations) def __init__(self, container): self.container = container @@ -99,6 +99,8 @@ # could have a simple subscriber for IObjectManager that directly calls # dispatchToSublocations. [EMAIL PROTECTED](OFS.interfaces.IItem, +OFS.interfaces.IObjectWillBeMovedEvent) def dispatchObjectWillBeMovedEvent(ob, event): """Multi-subscriber for IItem + IObjectWillBeMovedEvent. """ @@ -108,6 +110,7 @@ # Next, do the manage_beforeDelete dance callManageBeforeDelete(ob, event.object, event.oldParent) [EMAIL PROTECTED](OFS.interfaces.IItem, IObjectMovedEvent) def dispatchObjectMovedEvent(ob, event): """Multi-subscriber for IItem + IObjectMovedEvent. """ @@ -117,6 +120,8 @@ if OFS.interfaces.IObjectManager.providedBy(ob): dispatchToSublocations(ob, event) [EMAIL PROTECTED](OFS.interfaces.IItem, +OFS.interfaces.IObjectClonedEvent) def dispatchObjectClonedEvent(ob, event): """Multi-subscriber for IItem + IObjectClonedEvent. """ ___ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Products.Five/branches/philikon-local-components/event.zcml make use of in-python adapter() declaration
Log message for revision 67163: make use of in-python adapter() declaration Changed: U Products.Five/branches/philikon-local-components/event.zcml -=- Modified: Products.Five/branches/philikon-local-components/event.zcml === --- Products.Five/branches/philikon-local-components/event.zcml 2006-04-19 18:04:21 UTC (rev 67162) +++ Products.Five/branches/philikon-local-components/event.zcml 2006-04-19 18:05:47 UTC (rev 67163) @@ -5,35 +5,15 @@ + - - + - - + - - + - - ___ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Products.Five/branches/philikon-local-components/tests/ Better test setup (no ZCML, no placelesssetup). Should be faster now :).
Log message for revision 67164: Better test setup (no ZCML, no placelesssetup). Should be faster now :). Changed: U Products.Five/branches/philikon-local-components/tests/event.txt U Products.Five/branches/philikon-local-components/tests/test_event.py -=- Modified: Products.Five/branches/philikon-local-components/tests/event.txt === --- Products.Five/branches/philikon-local-components/tests/event.txt 2006-04-19 18:05:47 UTC (rev 67163) +++ Products.Five/branches/philikon-local-components/tests/event.txt 2006-04-19 18:11:46 UTC (rev 67164) @@ -25,9 +25,6 @@ A bit of setup for the tests. Because we'll test copy/paste, we need to work inside a database:: - >>> from zope.app.testing.placelesssetup import setUp, tearDown - >>> setUp() - >>> import ZODB.tests.util >>> db = ZODB.tests.util.DB() >>> connection = db.open() @@ -58,7 +55,7 @@ framework's ones, so ours will be called first. This has the effect that printed events will be in their "natural" order:: - >>> from zope.component.interfaces import IObjectEvent + >>> from zope.component.interfaces import IObjectEvent, IRegistrationEvent >>> from zope.app.container.interfaces import IObjectMovedEvent >>> from OFS.interfaces import IObjectWillBeMovedEvent >>> from OFS.interfaces import IObjectClonedEvent @@ -68,7 +65,8 @@ >>> def printObjectEventExceptSome(object, event): ... if (IObjectMovedEvent.providedBy(event) or ... IObjectWillBeMovedEvent.providedBy(event) or - ... IObjectClonedEvent.providedBy(event)): + ... IObjectClonedEvent.providedBy(event) or + ... IRegistrationEvent.providedBy(event)): ... return ... print event.__class__.__name__, object.getId() @@ -80,11 +78,12 @@ Finally we need to load the subscribers configuration:: - >>> from Products.Five import zcml - >>> import Products.Five >>> import zope.component - >>> zcml.load_config('meta.zcml', zope.component) - >>> zcml.load_config('event.zcml', Products.Five) + >>> import OFS.subscribers + >>> zope.component.provideAdapter(OFS.subscribers.ObjectManagerSublocations) + >>> zope.component.provideHandler(OFS.subscribers.dispatchObjectWillBeMovedEvent) + >>> zope.component.provideHandler(OFS.subscribers.dispatchObjectMovedEvent) + >>> zope.component.provideHandler(OFS.subscribers.dispatchObjectClonedEvent) We need at least one fake deprecated method to tell the compatibility framework that component architecture is initialized:: @@ -465,4 +464,3 @@ >>> import transaction >>> transaction.abort() - >>> tearDown() Modified: Products.Five/branches/philikon-local-components/tests/test_event.py === --- Products.Five/branches/philikon-local-components/tests/test_event.py 2006-04-19 18:05:47 UTC (rev 67163) +++ Products.Five/branches/philikon-local-components/tests/test_event.py 2006-04-19 18:11:46 UTC (rev 67164) @@ -28,6 +28,8 @@ from OFS.OrderedFolder import OrderedFolder from Products.BTreeFolder2.BTreeFolder2 import BTreeFolder2 +from zope.component.testing import setUp, tearDown + class DontComplain(object): def _verifyObjectPaste(self, object, validate_src=1): pass @@ -82,7 +84,8 @@ def test_suite(): from zope.testing.doctest import DocFileSuite -return DocFileSuite('event.txt', package="Products.Five.tests") +return DocFileSuite('event.txt', package="Products.Five.tests", +setUp=setUp, tearDown=tearDown) if __name__ == '__main__': framework() ___ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Products.Five/branches/philikon-local-components/tests/ get rid of some deprecated zcml directives
Log message for revision 67165: get rid of some deprecated zcml directives Changed: U Products.Five/branches/philikon-local-components/tests/directives.zcml U Products.Five/branches/philikon-local-components/tests/test_security.py -=- Modified: Products.Five/branches/philikon-local-components/tests/directives.zcml === --- Products.Five/branches/philikon-local-components/tests/directives.zcml 2006-04-19 18:11:46 UTC (rev 67164) +++ Products.Five/branches/philikon-local-components/tests/directives.zcml 2006-04-19 18:15:32 UTC (rev 67165) @@ -23,13 +23,6 @@ - - - - Modified: Products.Five/branches/philikon-local-components/tests/test_security.py === --- Products.Five/branches/philikon-local-components/tests/test_security.py 2006-04-19 18:11:46 UTC (rev 67164) +++ Products.Five/branches/philikon-local-components/tests/test_security.py 2006-04-19 18:15:32 UTC (rev 67165) @@ -72,13 +72,13 @@ >>> configure_zcml = ''' ... http://namespaces.zope.org/zope";> - ... + ... ... ... ... - ... + ... ... ... ''' >>> zcml.load_string(configure_zcml) ___ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Products.Five/branches/philikon-local-components/browser/tests/ new import location of setDefaultSkin
Log message for revision 67166: new import location of setDefaultSkin Changed: U Products.Five/branches/philikon-local-components/browser/tests/pages.txt U Products.Five/branches/philikon-local-components/browser/tests/test_menu.py -=- Modified: Products.Five/branches/philikon-local-components/browser/tests/pages.txt === --- Products.Five/branches/philikon-local-components/browser/tests/pages.txt 2006-04-19 18:15:32 UTC (rev 67165) +++ Products.Five/branches/philikon-local-components/browser/tests/pages.txt 2006-04-19 18:19:46 UTC (rev 67166) @@ -195,7 +195,7 @@ high-level security tests). Let's manually look up a protected view: >>> from zope.component import getMultiAdapter - >>> from zope.app.publication.browser import setDefaultSkin + >>> from zope.publisher.browser import setDefaultSkin >>> from Products.Five.traversable import FakeRequest >>> request = FakeRequest() >>> setDefaultSkin(request) Modified: Products.Five/branches/philikon-local-components/browser/tests/test_menu.py === --- Products.Five/branches/philikon-local-components/browser/tests/test_menu.py 2006-04-19 18:15:32 UTC (rev 67165) +++ Products.Five/branches/philikon-local-components/browser/tests/test_menu.py 2006-04-19 18:19:46 UTC (rev 67166) @@ -38,7 +38,7 @@ Now for some actual testing... Let's look up the menu we registered: >>> from Products.Five.traversable import FakeRequest - >>> from zope.app.publication.browser import setDefaultSkin + >>> from zope.publisher.browser import setDefaultSkin >>> from zope.app.publisher.browser.menu import getMenu >>> request = FakeRequest() ___ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Products.Five/branches/philikon-local-components/browser/configure.zcml get rid of some deprecated stuff
Log message for revision 67167: get rid of some deprecated stuff Changed: U Products.Five/branches/philikon-local-components/browser/configure.zcml -=- Modified: Products.Five/branches/philikon-local-components/browser/configure.zcml === --- Products.Five/branches/philikon-local-components/browser/configure.zcml 2006-04-19 18:19:46 UTC (rev 67166) +++ Products.Five/branches/philikon-local-components/browser/configure.zcml 2006-04-19 18:20:08 UTC (rev 67167) @@ -4,22 +4,13 @@ - - - - http://mail.zope.org/mailman/listinfo/zope-checkins