Log message for revision 67665: Merge philikon-local-components branch into this one. This retires philikon-local-components branch.
Changed: U Zope/branches/zope33-port/lib/python/App/ImageFile.py U Zope/branches/zope33-port/lib/python/OFS/CopySupport.py U Zope/branches/zope33-port/lib/python/OFS/DTMLDocument.py U Zope/branches/zope33-port/lib/python/OFS/DTMLMethod.py U Zope/branches/zope33-port/lib/python/OFS/Image.py U Zope/branches/zope33-port/lib/python/OFS/ObjectManager.py U Zope/branches/zope33-port/lib/python/OFS/content_types.py U Zope/branches/zope33-port/lib/python/OFS/event.py U Zope/branches/zope33-port/lib/python/OFS/interfaces.py U Zope/branches/zope33-port/lib/python/OFS/subscribers.py _U Zope/branches/zope33-port/lib/python/Products/ U Zope/branches/zope33-port/lib/python/Products/PageTemplates/ZopePageTemplate.py U Zope/branches/zope33-port/lib/python/TAL/TALInterpreter.py U Zope/branches/zope33-port/lib/python/ZClasses/Method.py U Zope/branches/zope33-port/lib/python/Zope2/Startup/handlers.py U Zope/branches/zope33-port/lib/python/webdav/NullResource.py _U Zope/branches/zope33-port/lib/python/zope/ -=- Modified: Zope/branches/zope33-port/lib/python/App/ImageFile.py =================================================================== --- Zope/branches/zope33-port/lib/python/App/ImageFile.py 2006-04-27 20:22:37 UTC (rev 67664) +++ Zope/branches/zope33-port/lib/python/App/ImageFile.py 2006-04-27 20:25:01 UTC (rev 67665) @@ -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.""" Modified: Zope/branches/zope33-port/lib/python/OFS/CopySupport.py =================================================================== --- Zope/branches/zope33-port/lib/python/OFS/CopySupport.py 2006-04-27 20:22:37 UTC (rev 67664) +++ Zope/branches/zope33-port/lib/python/OFS/CopySupport.py 2006-04-27 20:25:01 UTC (rev 67665) @@ -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/zope33-port/lib/python/OFS/DTMLDocument.py =================================================================== --- Zope/branches/zope33-port/lib/python/OFS/DTMLDocument.py 2006-04-27 20:22:37 UTC (rev 67664) +++ Zope/branches/zope33-port/lib/python/OFS/DTMLDocument.py 2006-04-27 20:25:01 UTC (rev 67665) @@ -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/zope33-port/lib/python/OFS/DTMLMethod.py =================================================================== --- Zope/branches/zope33-port/lib/python/OFS/DTMLMethod.py 2006-04-27 20:22:37 UTC (rev 67664) +++ Zope/branches/zope33-port/lib/python/OFS/DTMLMethod.py 2006-04-27 20:25:01 UTC (rev 67665) @@ -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/zope33-port/lib/python/OFS/Image.py =================================================================== --- Zope/branches/zope33-port/lib/python/OFS/Image.py 2006-04-27 20:22:37 UTC (rev 67664) +++ Zope/branches/zope33-port/lib/python/OFS/Image.py 2006-04-27 20:25:01 UTC (rev 67665) @@ -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/zope33-port/lib/python/OFS/ObjectManager.py =================================================================== --- Zope/branches/zope33-port/lib/python/OFS/ObjectManager.py 2006-04-27 20:22:37 UTC (rev 67664) +++ Zope/branches/zope33-port/lib/python/OFS/ObjectManager.py 2006-04-27 20:25:01 UTC (rev 67665) @@ -46,6 +46,7 @@ from ZODB.POSException import ConflictError from zope.interface import implements +from zope.component.interfaces import ComponentLookupError import CopySupport from interfaces import IObjectManager @@ -166,6 +167,21 @@ isPrincipiaFolderish=1 + # IPossibleSite API + + _components = None + + security.declarePublic('getSiteManager') + def getSiteManager(self): + if self._components is None: + raise ComponentLookupError('No component registry defined.') + return self._components + + security.declareProtected('Manage Site', 'setSiteManager') + def setSiteManager(self, components): + self._components = components + + def __class_init__(self): try: mt=list(self.meta_types) except: mt=[] Modified: Zope/branches/zope33-port/lib/python/OFS/content_types.py =================================================================== --- Zope/branches/zope33-port/lib/python/OFS/content_types.py 2006-04-27 20:22:37 UTC (rev 67664) +++ Zope/branches/zope33-port/lib/python/OFS/content_types.py 2006-04-27 20:25:01 UTC (rev 67665) @@ -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 Modified: Zope/branches/zope33-port/lib/python/OFS/event.py =================================================================== --- Zope/branches/zope33-port/lib/python/OFS/event.py 2006-04-27 20:22:37 UTC (rev 67664) +++ Zope/branches/zope33-port/lib/python/OFS/event.py 2006-04-27 20:25:01 UTC (rev 67665) @@ -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/zope33-port/lib/python/OFS/interfaces.py =================================================================== --- Zope/branches/zope33-port/lib/python/OFS/interfaces.py 2006-04-27 20:22:37 UTC (rev 67664) +++ Zope/branches/zope33-port/lib/python/OFS/interfaces.py 2006-04-27 20:25:01 UTC (rev 67665) @@ -27,7 +27,8 @@ 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): @@ -476,13 +477,12 @@ # not synced with ZopeBook API Reference; # based on OFS.ObjectManager.ObjectManager class IObjectManager(IZopeObject, ICopyContainer, INavigation, IManageable, - IAcquirer, IPersistent, IDAVCollection, ITraversable): - + IAcquirer, IPersistent, IDAVCollection, ITraversable, + IPossibleSite): """Generic object manager This interface provides core behavior for collections of heterogeneous - objects. - """ + objects.""" meta_types = Tuple( title=u"Meta types", @@ -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/zope33-port/lib/python/OFS/subscribers.py =================================================================== --- Zope/branches/zope33-port/lib/python/OFS/subscribers.py 2006-04-27 20:22:37 UTC (rev 67664) +++ Zope/branches/zope33-port/lib/python/OFS/subscribers.py 2006-04-27 20:25:01 UTC (rev 67665) @@ -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 +import zope.component +import zope.interface +import zope.location.interfaces from zope.app.container.contained import dispatchToSublocations -from zope.app.location.interfaces import ISublocations +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. """ Property changes on: Zope/branches/zope33-port/lib/python/Products ___________________________________________________________________ Name: svn:externals - # updated to get a more recent working Five snapshot (what will be Five 1.5 # and actually included with Zope 2.10 Five -r67270 svn://svn.zope.org/repos/main/Products.Five/trunk + Five svn://svn.zope.org/repos/main/Products.Five/branches/zope33-port Modified: Zope/branches/zope33-port/lib/python/Products/PageTemplates/ZopePageTemplate.py =================================================================== --- Zope/branches/zope33-port/lib/python/Products/PageTemplates/ZopePageTemplate.py 2006-04-27 20:22:37 UTC (rev 67664) +++ Zope/branches/zope33-port/lib/python/Products/PageTemplates/ZopePageTemplate.py 2006-04-27 20:25:01 UTC (rev 67665) @@ -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/zope33-port/lib/python/TAL/TALInterpreter.py =================================================================== --- Zope/branches/zope33-port/lib/python/TAL/TALInterpreter.py 2006-04-27 20:22:37 UTC (rev 67664) +++ Zope/branches/zope33-port/lib/python/TAL/TALInterpreter.py 2006-04-27 20:25:01 UTC (rev 67665) @@ -24,11 +24,7 @@ from DocumentTemplate.DT_Util import ustr from ZODB.POSException import ConflictError -# BBB 2005/10/10 -- MessageIDs are to be removed for Zope 3.3 -import zope.deprecation -zope.deprecation.__show__.off() -from zope.i18nmessageid import Message, MessageID -zope.deprecation.__show__.on() +from zope.i18nmessageid import Message from TALDefs import attrEscape, TAL_VERSION, METALError from TALDefs import isCurrentVersion @@ -36,8 +32,7 @@ from TALGenerator import TALGenerator from TranslationContext import TranslationContext -# This will become (MessageID, Message) when we use Zope 3.1 as a base: -I18nMessageTypes = Message, MessageID +I18nMessageTypes = (Message,) # TODO: In Python 2.4 we can use frozenset() instead of dict.fromkeys() BOOLEAN_HTML_ATTRS = dict.fromkeys([ Modified: Zope/branches/zope33-port/lib/python/ZClasses/Method.py =================================================================== --- Zope/branches/zope33-port/lib/python/ZClasses/Method.py 2006-04-27 20:22:37 UTC (rev 67664) +++ Zope/branches/zope33-port/lib/python/ZClasses/Method.py 2006-04-27 20:25:01 UTC (rev 67665) @@ -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/zope33-port/lib/python/Zope2/Startup/handlers.py =================================================================== --- Zope/branches/zope33-port/lib/python/Zope2/Startup/handlers.py 2006-04-27 20:22:37 UTC (rev 67664) +++ Zope/branches/zope33-port/lib/python/Zope2/Startup/handlers.py 2006-04-27 20:25:01 UTC (rev 67665) @@ -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 Modified: Zope/branches/zope33-port/lib/python/webdav/NullResource.py =================================================================== --- Zope/branches/zope33-port/lib/python/webdav/NullResource.py 2006-04-27 20:22:37 UTC (rev 67664) +++ Zope/branches/zope33-port/lib/python/webdav/NullResource.py 2006-04-27 20:25:01 UTC (rev 67665) @@ -39,7 +39,7 @@ from Resource import Resource from WriteLockInterface import WriteLockInterface -from zope.app.contenttypes import guess_content_type +from zope.contenttype import guess_content_type class NullResource(Persistent, Acquisition.Implicit, Resource): Property changes on: Zope/branches/zope33-port/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 contentprovider -r 66018 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/contentprovider viewlet -r 66018 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/viewlet + app -r 67650 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/app cachedescriptors -r 67650 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/cachedescriptors component -r 67650 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/component configuration -r 67650 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/configuration documenttemplate -r 67650 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/documenttemplate event -r 67650 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/event exceptions -r 67650 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/exceptions hookable -r 67650 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/hookable i18n -r 67650 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/i18n i18nmessageid -r 67650 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/i18nmessageid interface -r 67650 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/interface modulealias -r 67650 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/modulealias pagetemplate -r 67650 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/pagetemplate proxy -r 67650 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/proxy publisher -r 67650 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/publisher schema -r 67650 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/schema security -r 67650 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/security server -r 67650 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/server structuredtext -r 67650 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/structuredtext tal -r 67650 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/tal tales -r 67650 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/tales testing -r 41141 svn://svn.zope.org/repos/main/zope.testing/trunk/src/zope/testing thread -r 67650 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/thread deprecation -r 67650 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/deprecation dottedname -r 67650 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/dottedname formlib -r 67650 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/formlib index -r 67650 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/index testbrowser -r 67650 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/testbrowser contentprovider -r 67650 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/contentprovider viewlet -r 67650 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/viewlet annotation -r 67650 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/annotation contenttype -r 67650 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/contenttype copypastemove -r 67650 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/copypastemove datetime -r 67650 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/datetime decorator -r 67650 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/decorator deferredimport -r 67650 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/deferredimport dublincore -r 67650 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/dublincore filerepresentation -r 67650 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/filerepresentation lifecycleevent -r 67650 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/lifecycleevent location -r 67650 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/location rdb -r 67650 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/rdb sendmail -r 67650 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/sendmail size -r 67650 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/size traversing -r 67650 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/traversing _______________________________________________ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins