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 @@ <adapter for="OFS.interfaces.IObjectManager" - provides="zope.app.location.interfaces.ISublocations" + provides="zope.location.interfaces.ISublocations" factory="OFS.subscribers.ObjectManagerSublocations" /> 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