[Checkins] SVN: zope.generic/trunk/src/zope/generic/ reflect newest api changes from the jim-adapter-branch

Dominik Huber dominik.huber at perse.ch
Fri Apr 28 08:45:39 EDT 2006


Log message for revision 67719:
  reflect newest api changes from the jim-adapter-branch

Changed:
  U   zope.generic/trunk/src/zope/generic/adapter/DEPENDENCIES.cfg
  U   zope.generic/trunk/src/zope/generic/adapter/adapter.py
  U   zope.generic/trunk/src/zope/generic/adapter/metaconfigure.py
  U   zope.generic/trunk/src/zope/generic/adapter/metadirectives.py
  U   zope.generic/trunk/src/zope/generic/adapter/testing.py
  U   zope.generic/trunk/src/zope/generic/configuration/DEPENDENCIES.cfg
  U   zope.generic/trunk/src/zope/generic/configuration/README.txt
  U   zope.generic/trunk/src/zope/generic/configuration/adapter.py
  U   zope.generic/trunk/src/zope/generic/configuration/event.py
  U   zope.generic/trunk/src/zope/generic/configuration/interfaces.py
  U   zope.generic/trunk/src/zope/generic/configuration/testing.py
  U   zope.generic/trunk/src/zope/generic/directlyprovides/README.txt
  U   zope.generic/trunk/src/zope/generic/directlyprovides/handler.py
  U   zope.generic/trunk/src/zope/generic/directlyprovides/interfaces.py
  U   zope.generic/trunk/src/zope/generic/directlyprovides/property.py
  U   zope.generic/trunk/src/zope/generic/directlyprovides/testing.py
  U   zope.generic/trunk/src/zope/generic/factory/README.txt
  U   zope.generic/trunk/src/zope/generic/factory/factory.py
  U   zope.generic/trunk/src/zope/generic/factory/testing.py
  U   zope.generic/trunk/src/zope/generic/handler/DEPENDENCIES.cfg
  U   zope.generic/trunk/src/zope/generic/handler/README.txt
  U   zope.generic/trunk/src/zope/generic/handler/metaconfigure.py
  U   zope.generic/trunk/src/zope/generic/handler/testing.py
  U   zope.generic/trunk/src/zope/generic/informationprovider/README.txt
  U   zope.generic/trunk/src/zope/generic/informationprovider/api.py
  U   zope.generic/trunk/src/zope/generic/informationprovider/base.py
  U   zope.generic/trunk/src/zope/generic/informationprovider/metaconfigure.py
  U   zope.generic/trunk/src/zope/generic/informationprovider/testing.py
  U   zope.generic/trunk/src/zope/generic/keyface/DEPENDENCIES.cfg
  U   zope.generic/trunk/src/zope/generic/keyface/adapter.py
  U   zope.generic/trunk/src/zope/generic/keyface/metaconfigure.py
  U   zope.generic/trunk/src/zope/generic/keyface/testing.py
  U   zope.generic/trunk/src/zope/generic/operation/metaconfigure.py
  U   zope.generic/trunk/src/zope/generic/site/helper.py
  U   zope.generic/trunk/src/zope/generic/testing/DEPENDENCIES.cfg
  U   zope.generic/trunk/src/zope/generic/testing/testing.py
  U   zope.generic/trunk/src/zope/generic/type/DEPENDENCIES.cfg
  U   zope.generic/trunk/src/zope/generic/type/README.txt
  U   zope.generic/trunk/src/zope/generic/type/interfaces.py
  U   zope.generic/trunk/src/zope/generic/type/testing.py

-=-
Modified: zope.generic/trunk/src/zope/generic/adapter/DEPENDENCIES.cfg
===================================================================
--- zope.generic/trunk/src/zope/generic/adapter/DEPENDENCIES.cfg	2006-04-28 11:52:12 UTC (rev 67718)
+++ zope.generic/trunk/src/zope/generic/adapter/DEPENDENCIES.cfg	2006-04-28 12:45:37 UTC (rev 67719)
@@ -1,5 +1,5 @@
 zope.app.component
-zope.app.location
+zope.location
 zope.app.security
 zope.app.testing
 zope.component

Modified: zope.generic/trunk/src/zope/generic/adapter/adapter.py
===================================================================
--- zope.generic/trunk/src/zope/generic/adapter/adapter.py	2006-04-28 11:52:12 UTC (rev 67718)
+++ zope.generic/trunk/src/zope/generic/adapter/adapter.py	2006-04-28 12:45:37 UTC (rev 67719)
@@ -18,7 +18,7 @@
 
 __docformat__ = 'restructuredtext'
 
-from zope.app.location import Location
+from zope.location import Location
 from zope.interface import classImplements
 from zope.interface import implements
 

Modified: zope.generic/trunk/src/zope/generic/adapter/metaconfigure.py
===================================================================
--- zope.generic/trunk/src/zope/generic/adapter/metaconfigure.py	2006-04-28 11:52:12 UTC (rev 67718)
+++ zope.generic/trunk/src/zope/generic/adapter/metaconfigure.py	2006-04-28 12:45:37 UTC (rev 67719)
@@ -19,9 +19,9 @@
 __docformat__ = 'restructuredtext'
 
 from zope.app.component.contentdirective import ClassDirective
-from zope.app.component.metaconfigure import adapter
-from zope.app.location import ILocation
+from zope.component.zcml import adapter
 from zope.configuration.exceptions import ConfigurationError
+from zope.location import ILocation
 
 from zope.generic.configuration import IConfigurationType
 

Modified: zope.generic/trunk/src/zope/generic/adapter/metadirectives.py
===================================================================
--- zope.generic/trunk/src/zope/generic/adapter/metadirectives.py	2006-04-28 11:52:12 UTC (rev 67718)
+++ zope.generic/trunk/src/zope/generic/adapter/metadirectives.py	2006-04-28 12:45:37 UTC (rev 67719)
@@ -19,13 +19,13 @@
 __docformat__ = 'restructuredtext'
 
 from zope.app.i18n import ZopeMessageFactory as _
-from zope.app.security.fields import Permission
 from zope.configuration.fields import GlobalInterface
 from zope.configuration.fields import GlobalObject
 from zope.configuration.fields import PythonIdentifier
 from zope.configuration.fields import Tokens
 from zope.interface import Interface
 from zope.schema import DottedName
+from zope.security.zcml import Permission
 
 
 class IForAdapterDirective(Interface):

Modified: zope.generic/trunk/src/zope/generic/adapter/testing.py
===================================================================
--- zope.generic/trunk/src/zope/generic/adapter/testing.py	2006-04-28 11:52:12 UTC (rev 67718)
+++ zope.generic/trunk/src/zope/generic/adapter/testing.py	2006-04-28 12:45:37 UTC (rev 67719)
@@ -19,14 +19,16 @@
 __docformat__ = 'restructuredtext'
 
 import zope.app.testing.placelesssetup
-from zope.configuration.xmlconfig import XMLConfig
-
 import zope.generic.adapter.testing
 import zope.generic.configuration.testing
 import zope.generic.directlyprovides.testing
 import zope.generic.keyface.testing
 import zope.generic.testing.testing
 
+from zope.configuration.xmlconfig import XMLConfig
+
+
+
 ################################################################################
 #
 # Public Test implementations

Modified: zope.generic/trunk/src/zope/generic/configuration/DEPENDENCIES.cfg
===================================================================
--- zope.generic/trunk/src/zope/generic/configuration/DEPENDENCIES.cfg	2006-04-28 11:52:12 UTC (rev 67718)
+++ zope.generic/trunk/src/zope/generic/configuration/DEPENDENCIES.cfg	2006-04-28 12:45:37 UTC (rev 67719)
@@ -1,7 +1,7 @@
 BTrees
 persistent
 zope.app.event
-zope.app.location
+zope.location
 zope.app.testing
 zope.component
 zope.event

Modified: zope.generic/trunk/src/zope/generic/configuration/README.txt
===================================================================
--- zope.generic/trunk/src/zope/generic/configuration/README.txt	2006-04-28 11:52:12 UTC (rev 67718)
+++ zope.generic/trunk/src/zope/generic/configuration/README.txt	2006-04-28 12:45:37 UTC (rev 67719)
@@ -122,25 +122,25 @@
     KeyError: <InterfaceClass example.IFooConfiguration>
 
 You can create valid configuration data using the generic ConfigurationData
-implementation and a configuration schema:
+implementation and a configuration schema. The setting of the configuration is
+notified by a object configured event if the parent has a location an the 
+parent's parent is not None:
 
+    >>> from zope.component.eventtesting import getEvents, clearEvents
     >>> from zope.generic.configuration.api import ConfigurationData
+    >>> from zope.generic.configuration.api import IObjectConfiguredEvent
 
+    >>> clearEvents()
+
     >>> data = ConfigurationData(IFooConfiguration, {'foo': u'Foo!'})
 
     >>> configurations[IFooConfiguration] = data
 
-The setting of the configuration is notified by a object configured event if 
-the parent has a location an the parent's parent is not None:
-
-    >>> from zope.app.event.tests.placelesssetup import getEvents, clearEvents
-    >>> from zope.generic.configuration.api import IObjectConfiguredEvent
-
     >>> events = getEvents()
     >>> len(events)
     0
 
-    >>> from zope.app.location import Location
+    >>> from zope.location import Location
     >>> parent = Location()
     >>> configurations.__parent__ = parent
     

Modified: zope.generic/trunk/src/zope/generic/configuration/adapter.py
===================================================================
--- zope.generic/trunk/src/zope/generic/configuration/adapter.py	2006-04-28 11:52:12 UTC (rev 67718)
+++ zope.generic/trunk/src/zope/generic/configuration/adapter.py	2006-04-28 12:45:37 UTC (rev 67719)
@@ -22,8 +22,8 @@
 import transaction
 from UserDict import DictMixin
 
-from zope.app.location import Location
-from zope.app.location.interfaces import ILocation
+from zope.location import Location
+from zope.location.interfaces import ILocation
 from zope.component import adapts
 from zope.event import notify
 from zope.interface import implements

Modified: zope.generic/trunk/src/zope/generic/configuration/event.py
===================================================================
--- zope.generic/trunk/src/zope/generic/configuration/event.py	2006-04-28 11:52:12 UTC (rev 67718)
+++ zope.generic/trunk/src/zope/generic/configuration/event.py	2006-04-28 12:45:37 UTC (rev 67719)
@@ -18,7 +18,7 @@
 
 __docformat__ = 'restructuredtext'
 
-from zope.app.event.objectevent import ObjectEvent
+from zope.component.interfaces import ObjectEvent
 from zope.interface import implements
 
 from zope.generic.configuration import IObjectConfiguredEvent
@@ -98,7 +98,7 @@
         >>> descriptions = []
         >>> descriptions.append(Configuration(IMyConfiguration, {'my': u'Bla'}))
         >>> descriptions.append(Configuration(IYourConfiguration))
-        >>> from zope.app.event.objectevent import Attributes
+        >>> from zope.lifecycleevent import Attributes
         >>> descriptions.append(Attributes(IRegularInterface))
         >>> context = object()
         >>> event = ObjectConfiguredEvent(context, *descriptions)

Modified: zope.generic/trunk/src/zope/generic/configuration/interfaces.py
===================================================================
--- zope.generic/trunk/src/zope/generic/configuration/interfaces.py	2006-04-28 11:52:12 UTC (rev 67718)
+++ zope.generic/trunk/src/zope/generic/configuration/interfaces.py	2006-04-28 12:45:37 UTC (rev 67719)
@@ -18,11 +18,11 @@
 
 __docformat__ = 'restructuredtext'
 
-from zope.app.event.interfaces import IModificationDescription
-from zope.app.event.interfaces import IObjectEvent
-from zope.app.location import ILocation
+from zope.location import ILocation
+from zope.component.interfaces import IObjectEvent
+from zope.interface import Attribute
 from zope.interface import Interface
-from zope.interface import Attribute
+from zope.lifecycleevent.interfaces import IModificationDescription
 
 from zope.generic.keyface import IKeyfaced
 from zope.generic.keyface import IKeyfaceType

Modified: zope.generic/trunk/src/zope/generic/configuration/testing.py
===================================================================
--- zope.generic/trunk/src/zope/generic/configuration/testing.py	2006-04-28 11:52:12 UTC (rev 67718)
+++ zope.generic/trunk/src/zope/generic/configuration/testing.py	2006-04-28 12:45:37 UTC (rev 67719)
@@ -19,15 +19,18 @@
 __docformat__ = 'restructuredtext'
 
 import zope.app.testing.placelesssetup
+import zope.generic.configuration.testing
+import zope.generic.directlyprovides.testing
+import zope.generic.keyface.testing
+import zope.generic.testing.testing
+
 from zope.component import provideAdapter
+from zope.component.eventtesting import clearEvents
 from zope.interface import Interface
 from zope.schema import TextLine
 
-import zope.generic.configuration.testing
-import zope.generic.keyface.testing
-import zope.generic.directlyprovides.testing
-import zope.generic.testing.testing
 
+
 ################################################################################
 #
 # Public Test implementations
@@ -75,6 +78,8 @@
     provideAdapter(zope.generic.configuration.adapter.AttributeConfigurations,
         provides=IConfigurations)
 
+    clearEvents()
+
 def tearDown(doctest=None):
     pass
 
@@ -92,6 +97,7 @@
         # internal setup
         setUp(doctest)
 
+
     def tearDown(self, doctest=None):
         # internal teardown
         tearDown(doctest)

Modified: zope.generic/trunk/src/zope/generic/directlyprovides/README.txt
===================================================================
--- zope.generic/trunk/src/zope/generic/directlyprovides/README.txt	2006-04-28 11:52:12 UTC (rev 67718)
+++ zope.generic/trunk/src/zope/generic/directlyprovides/README.txt	2006-04-28 12:45:37 UTC (rev 67719)
@@ -174,7 +174,7 @@
     >>> component.provideHandler(notifyDirectlyProvidesModifiedEvent,
     ...     (api.IProvides, api.IDirectlyProvidesModifiedEvent))
 
-    >>> from zope.app.event.interfaces import IObjectModifiedEvent
+    >>> from zope.lifecycleevent.interfaces import IObjectModifiedEvent
 
     >>> def notifyObjectModifiedEvent(first, second=None):
     ...     if second:

Modified: zope.generic/trunk/src/zope/generic/directlyprovides/handler.py
===================================================================
--- zope.generic/trunk/src/zope/generic/directlyprovides/handler.py	2006-04-28 11:52:12 UTC (rev 67718)
+++ zope.generic/trunk/src/zope/generic/directlyprovides/handler.py	2006-04-28 12:45:37 UTC (rev 67719)
@@ -17,8 +17,8 @@
 """
 
 from zope.component import subscribers
-from zope.app.event.objectevent import Attributes
-from zope.app.event.objectevent import ObjectModifiedEvent
+from zope.lifecycleevent import Attributes
+from zope.lifecycleevent import ObjectModifiedEvent
 
 from zope.generic.directlyprovides import IProvides
 from zope.generic.directlyprovides import IObjectModifiedEventDispatchingProvides

Modified: zope.generic/trunk/src/zope/generic/directlyprovides/interfaces.py
===================================================================
--- zope.generic/trunk/src/zope/generic/directlyprovides/interfaces.py	2006-04-28 11:52:12 UTC (rev 67718)
+++ zope.generic/trunk/src/zope/generic/directlyprovides/interfaces.py	2006-04-28 12:45:37 UTC (rev 67719)
@@ -19,13 +19,12 @@
 __docformat__ = 'restructuredtext'
 
 from zope.app.i18n import ZopeMessageFactory as _
+from zope.component.interfaces import IObjectEvent
 from zope.interface import Attribute
 from zope.interface import Interface
 
-from zope.app.event.interfaces import IObjectEvent
 
 
-
 class IProvides(Interface):
     """Prependes important interfaces within the directly provides mechanism."""
 

Modified: zope.generic/trunk/src/zope/generic/directlyprovides/property.py
===================================================================
--- zope.generic/trunk/src/zope/generic/directlyprovides/property.py	2006-04-28 11:52:12 UTC (rev 67718)
+++ zope.generic/trunk/src/zope/generic/directlyprovides/property.py	2006-04-28 12:45:37 UTC (rev 67719)
@@ -90,7 +90,7 @@
         # everything prepended correctly   
         elif is_ok:
             if list(Declaration(value.__bases__[:-1])) != list(directlyProvidedBy(inst)):
-                value.changed()
+                # value.changed()
                 inst.__dict__['__provides__'] = value
                 
                 notify(DirectlyProvidesModifiedEvent(inst))
@@ -154,18 +154,21 @@
         >>> from zope.app.testing import placelesssetup
         >>> placelesssetup.setUp()
     
-        >>> from zope.app.event.tests.placelesssetup import events
+        >>> from zope.component.eventtesting import getEvents, clearEvents
         >>> from zope.interface import directlyProvidedBy
 
         >>> class IA(Interface):
         ...     pass
 
+        >>> clearEvents()
+        >>> events = getEvents()
         >>> len(events)
         0
 
         >>> bar = Bar()
         >>> directlyProvides(bar, IA)
-        
+
+        >>> events = getEvents()
         >>> len(events)
         1
         >>> events.pop() # doctest: +ELLIPSIS

Modified: zope.generic/trunk/src/zope/generic/directlyprovides/testing.py
===================================================================
--- zope.generic/trunk/src/zope/generic/directlyprovides/testing.py	2006-04-28 11:52:12 UTC (rev 67718)
+++ zope.generic/trunk/src/zope/generic/directlyprovides/testing.py	2006-04-28 12:45:37 UTC (rev 67719)
@@ -18,11 +18,13 @@
 
 __docformat__ = 'restructuredtext'
 
-from zope.component import provideHandler
 import zope.app.testing.placelesssetup
 import zope.generic.testing.testing
 
+from zope.component import provideHandler
 
+
+
 ################################################################################
 #
 # Public Test implementations

Modified: zope.generic/trunk/src/zope/generic/factory/README.txt
===================================================================
--- zope.generic/trunk/src/zope/generic/factory/README.txt	2006-04-28 11:52:12 UTC (rev 67718)
+++ zope.generic/trunk/src/zope/generic/factory/README.txt	2006-04-28 12:45:37 UTC (rev 67719)
@@ -102,6 +102,13 @@
 After this registration we find the following stuff within the component
 registration:
 
+    >>> from zope.component.eventtesting import getEvents, clearEvents
+    
+    >>> events = getEvents()
+    >>> len(events)
+    2
+    >>> clearEvents()
+
     >>> from zope.component import IFactory
     >>> from zope.generic.keyface.api import toDottedName
 
@@ -155,8 +162,6 @@
     (u'a bla', None, u'c default')
 
 We selected object created event notification too:
-
-    >>> from zope.app.event.tests.placelesssetup import getEvents, clearEvents
     
     >>> events = getEvents()
     >>> len(events)

Modified: zope.generic/trunk/src/zope/generic/factory/factory.py
===================================================================
--- zope.generic/trunk/src/zope/generic/factory/factory.py	2006-04-28 11:52:12 UTC (rev 67718)
+++ zope.generic/trunk/src/zope/generic/factory/factory.py	2006-04-28 12:45:37 UTC (rev 67719)
@@ -20,7 +20,7 @@
 
 from zope.component import factory
 from zope.event import notify
-from zope.app.event.objectevent import ObjectCreatedEvent
+from zope.lifecycleevent import ObjectCreatedEvent
 from zope.interface import alsoProvides
 
 from zope.generic.configuration.api import parameterToConfiguration
@@ -92,7 +92,7 @@
 
     We can notify an ObjectCreatedEvent for created instance:
 
-        >>> from zope.app.event.tests.placelesssetup import getEvents, clearEvents
+        >>> from zope.component.eventtesting import getEvents, clearEvents
         >>> clearEvents()
 
         >>> f = Factory(Simple, IMyInstance, notifyCreated=True)

Modified: zope.generic/trunk/src/zope/generic/factory/testing.py
===================================================================
--- zope.generic/trunk/src/zope/generic/factory/testing.py	2006-04-28 11:52:12 UTC (rev 67718)
+++ zope.generic/trunk/src/zope/generic/factory/testing.py	2006-04-28 12:45:37 UTC (rev 67719)
@@ -19,8 +19,6 @@
 __docformat__ = 'restructuredtext'
 
 import zope.app.testing.placelesssetup
-from zope.configuration.xmlconfig import XMLConfig
-
 import zope.generic.configuration.testing
 import zope.generic.directlyprovides.testing
 import zope.generic.informationprovider.testing
@@ -28,6 +26,9 @@
 import zope.generic.operation.testing
 import zope.generic.testing.testing
 
+from zope.configuration.xmlconfig import XMLConfig
+
+
 ################################################################################
 #
 # Public Test implementations

Modified: zope.generic/trunk/src/zope/generic/handler/DEPENDENCIES.cfg
===================================================================
--- zope.generic/trunk/src/zope/generic/handler/DEPENDENCIES.cfg	2006-04-28 11:52:12 UTC (rev 67718)
+++ zope.generic/trunk/src/zope/generic/handler/DEPENDENCIES.cfg	2006-04-28 12:45:37 UTC (rev 67719)
@@ -1,5 +1,5 @@
 zope.app.component
-zope.app.location
+zope.location
 zope.app.security
 zope.app.testing
 zope.component

Modified: zope.generic/trunk/src/zope/generic/handler/README.txt
===================================================================
--- zope.generic/trunk/src/zope/generic/handler/README.txt	2006-04-28 11:52:12 UTC (rev 67718)
+++ zope.generic/trunk/src/zope/generic/handler/README.txt	2006-04-28 12:45:37 UTC (rev 67719)
@@ -34,7 +34,7 @@
     >>> registerDirective('''
     ... <generic:handler
     ...     keyface="example.IFoo"
-    ...     event="zope.app.event.interfaces.IObjectEvent"
+    ...     event="zope.component.interfaces.IObjectEvent"
     ...     operations="example.simplehandler"
     ...     />
     ... ''') 
@@ -46,8 +46,8 @@
 
     >>> foo = Foo()
 
-    >>> from zope.app.event.interfaces import IObjectEvent
-    >>> from zope.app.event.objectevent import ObjectEvent
+    >>> from zope.component.interfaces import IObjectEvent
+    >>> from zope.component.interfaces import ObjectEvent
     >>> from zope.event import notify
 
     >>> event = ObjectEvent(foo)

Modified: zope.generic/trunk/src/zope/generic/handler/metaconfigure.py
===================================================================
--- zope.generic/trunk/src/zope/generic/handler/metaconfigure.py	2006-04-28 11:52:12 UTC (rev 67718)
+++ zope.generic/trunk/src/zope/generic/handler/metaconfigure.py	2006-04-28 12:45:37 UTC (rev 67719)
@@ -18,7 +18,7 @@
 
 __docformat__ = 'restructuredtext'
 
-from zope.app.component.metaconfigure import subscriber
+from zope.component.zcml import subscriber
 
 from zope.generic.keyface import IKeyfaceType
 from zope.generic.operation.api import assertOperation

Modified: zope.generic/trunk/src/zope/generic/handler/testing.py
===================================================================
--- zope.generic/trunk/src/zope/generic/handler/testing.py	2006-04-28 11:52:12 UTC (rev 67718)
+++ zope.generic/trunk/src/zope/generic/handler/testing.py	2006-04-28 12:45:37 UTC (rev 67719)
@@ -19,14 +19,15 @@
 __docformat__ = 'restructuredtext'
 
 import zope.app.testing.placelesssetup
-from zope.configuration.xmlconfig import XMLConfig
-
-import zope.generic.handler.testing
 import zope.generic.configuration.testing
 import zope.generic.directlyprovides.testing
+import zope.generic.handler.testing
 import zope.generic.keyface.testing
 import zope.generic.testing.testing
 
+from zope.configuration.xmlconfig import XMLConfig
+
+
 ################################################################################
 #
 # Public Test implementations

Modified: zope.generic/trunk/src/zope/generic/informationprovider/README.txt
===================================================================
--- zope.generic/trunk/src/zope/generic/informationprovider/README.txt	2006-04-28 11:52:12 UTC (rev 67718)
+++ zope.generic/trunk/src/zope/generic/informationprovider/README.txt	2006-04-28 12:45:37 UTC (rev 67719)
@@ -58,6 +58,11 @@
 All information provider with the same interface can be gotten by the 
 getInformationProvidersFor function:
 
+    >>> from zope.component.eventtesting import getEvents, clearEvents
+    >>> len(getEvents())
+    2
+    >>> clearEvents()
+
     >>> listing = list(api.getInformationProvidersFor(ISpecialInformation))
     >>> len(listing) is 1
     True
@@ -165,6 +170,10 @@
     ...     </generic:informationProvider>
     ... ''')
 
+    >>> len(getEvents())
+    1
+    >>> clearEvents()
+
     >>> info = api.queryInformationProvider(IFooMarker, ISpecialInformation)
     >>> api.queryInformation(info, 'example.my_annotation') is my_annotation
     True
@@ -193,6 +202,10 @@
     ...     />
     ... ''') 
 
+    >>> len(getEvents())
+    1
+    >>> clearEvents()
+
     >>> from zope.generic.configuration.api import IConfigurationType
     >>> IConfigurationType.providedBy(IMyConfiguration)
     True
@@ -295,14 +308,13 @@
 The setting of the configuration is notified by a object configured event if 
 the parent has a location an the parent's parent is not None:
 
-    >>> from zope.app.event.tests.placelesssetup import getEvents, clearEvents
     >>> from zope.generic.configuration.api import IObjectConfiguredEvent
 
     >>> events = getEvents()
     >>> len(events)
     0
 
-    >>> from zope.app.location import Location
+    >>> from zope.location import Location
     >>> parent = Location()
     >>> configurations.__parent__ = parent
     

Modified: zope.generic/trunk/src/zope/generic/informationprovider/api.py
===================================================================
--- zope.generic/trunk/src/zope/generic/informationprovider/api.py	2006-04-28 11:52:12 UTC (rev 67718)
+++ zope.generic/trunk/src/zope/generic/informationprovider/api.py	2006-04-28 12:45:37 UTC (rev 67719)
@@ -18,7 +18,7 @@
 
 __docformat__ = 'restructuredtext'
 
-from zope.app.annotation import IAnnotations
+from zope.annotation import IAnnotations
 from zope.component import getUtilitiesFor
 from zope.component import getUtility
 from zope.generic.keyface.api import getKeyface

Modified: zope.generic/trunk/src/zope/generic/informationprovider/base.py
===================================================================
--- zope.generic/trunk/src/zope/generic/informationprovider/base.py	2006-04-28 11:52:12 UTC (rev 67718)
+++ zope.generic/trunk/src/zope/generic/informationprovider/base.py	2006-04-28 12:45:37 UTC (rev 67719)
@@ -18,9 +18,9 @@
 
 __docformat__ = 'restructuredtext'
 
-from zope.app.annotation import IAnnotations
-from zope.app.annotation import IAttributeAnnotatable
-from zope.app.annotation.attribute import AttributeAnnotations
+from zope.annotation import IAnnotations
+from zope.annotation import IAttributeAnnotatable
+from zope.annotation.attribute import AttributeAnnotations
 from zope.interface import alsoProvides
 from zope.interface import implements
 

Modified: zope.generic/trunk/src/zope/generic/informationprovider/metaconfigure.py
===================================================================
--- zope.generic/trunk/src/zope/generic/informationprovider/metaconfigure.py	2006-04-28 11:52:12 UTC (rev 67718)
+++ zope.generic/trunk/src/zope/generic/informationprovider/metaconfigure.py	2006-04-28 12:45:37 UTC (rev 67719)
@@ -18,8 +18,8 @@
 
 __docformat__ = 'restructuredtext'
 
-from zope.app.annotation import IAnnotations
-from zope.app.component.interface import provideInterface
+from zope.annotation import IAnnotations
+from zope.component.interface import provideInterface
 from zope.component import provideUtility
 from zope.configuration.exceptions import ConfigurationError
 from zope.interface import alsoProvides

Modified: zope.generic/trunk/src/zope/generic/informationprovider/testing.py
===================================================================
--- zope.generic/trunk/src/zope/generic/informationprovider/testing.py	2006-04-28 11:52:12 UTC (rev 67718)
+++ zope.generic/trunk/src/zope/generic/informationprovider/testing.py	2006-04-28 12:45:37 UTC (rev 67719)
@@ -19,13 +19,15 @@
 __docformat__ = 'restructuredtext'
 
 import zope.app.testing.placelesssetup
-from zope.configuration.xmlconfig import XMLConfig
-
 import zope.generic.configuration.testing
 import zope.generic.directlyprovides.testing
 import zope.generic.keyface.testing
 import zope.generic.testing.testing
 
+from zope.configuration.xmlconfig import XMLConfig
+
+
+
 ################################################################################
 #
 # Public Test implementations

Modified: zope.generic/trunk/src/zope/generic/keyface/DEPENDENCIES.cfg
===================================================================
--- zope.generic/trunk/src/zope/generic/keyface/DEPENDENCIES.cfg	2006-04-28 11:52:12 UTC (rev 67718)
+++ zope.generic/trunk/src/zope/generic/keyface/DEPENDENCIES.cfg	2006-04-28 12:45:37 UTC (rev 67719)
@@ -1,5 +1,5 @@
 zope.app.component
-zope.app.location
+zope.location
 zope.app.testing
 zope.component
 zope.configuration

Modified: zope.generic/trunk/src/zope/generic/keyface/adapter.py
===================================================================
--- zope.generic/trunk/src/zope/generic/keyface/adapter.py	2006-04-28 11:52:12 UTC (rev 67718)
+++ zope.generic/trunk/src/zope/generic/keyface/adapter.py	2006-04-28 12:45:37 UTC (rev 67719)
@@ -18,9 +18,9 @@
 
 __docformat__ = 'restructuredtext'
 
-from zope.app.location import Location
 from zope.component import adapts
 from zope.interface import implements
+from zope.location import Location
 
 from zope.generic.keyface import IAttributeKeyfaced
 from zope.generic.keyface import IKeyface

Modified: zope.generic/trunk/src/zope/generic/keyface/metaconfigure.py
===================================================================
--- zope.generic/trunk/src/zope/generic/keyface/metaconfigure.py	2006-04-28 11:52:12 UTC (rev 67718)
+++ zope.generic/trunk/src/zope/generic/keyface/metaconfigure.py	2006-04-28 12:45:37 UTC (rev 67719)
@@ -18,7 +18,7 @@
 
 __docformat__ = 'restructuredtext'
 
-from zope.app.component.interface import provideInterface
+from zope.component.interface import provideInterface
 from zope.configuration.exceptions import ConfigurationError
 from zope.interface import alsoProvides
 

Modified: zope.generic/trunk/src/zope/generic/keyface/testing.py
===================================================================
--- zope.generic/trunk/src/zope/generic/keyface/testing.py	2006-04-28 11:52:12 UTC (rev 67718)
+++ zope.generic/trunk/src/zope/generic/keyface/testing.py	2006-04-28 12:45:37 UTC (rev 67719)
@@ -19,14 +19,16 @@
 __docformat__ = 'restructuredtext'
 
 import zope.app.testing.placelesssetup
+import zope.generic.directlyprovides.testing
+import zope.generic.keyface.testing
+import zope.generic.testing.testing
+
 from zope.component import provideAdapter
 from zope.configuration.xmlconfig import XMLConfig
 from zope.interface import Interface
 
-import zope.generic.keyface.testing
-import zope.generic.directlyprovides.testing
-import zope.generic.testing.testing
 
+
 ################################################################################
 #
 # Public Test implementations

Modified: zope.generic/trunk/src/zope/generic/operation/metaconfigure.py
===================================================================
--- zope.generic/trunk/src/zope/generic/operation/metaconfigure.py	2006-04-28 11:52:12 UTC (rev 67718)
+++ zope.generic/trunk/src/zope/generic/operation/metaconfigure.py	2006-04-28 12:45:37 UTC (rev 67719)
@@ -18,7 +18,7 @@
 
 __docformat__ = 'restructuredtext'
 
-from zope.app.component.interface import provideInterface
+from zope.component.interface import provideInterface
 from zope.configuration.exceptions import ConfigurationError
 from zope.interface import alsoProvides
 

Modified: zope.generic/trunk/src/zope/generic/site/helper.py
===================================================================
--- zope.generic/trunk/src/zope/generic/site/helper.py	2006-04-28 11:52:12 UTC (rev 67718)
+++ zope.generic/trunk/src/zope/generic/site/helper.py	2006-04-28 12:45:37 UTC (rev 67719)
@@ -20,9 +20,9 @@
 
 from zope.app import zapi
 from zope.app.container.interfaces import INameChooser
-from zope.app.component.interfaces.registration import ActiveStatus
-from zope.app.component.interfaces import IPossibleSite
-from zope.app.component.interfaces import ISite
+from zope.component.interfaces.registration import ActiveStatus
+from zope.component.interfaces import IPossibleSite
+from zope.component.interfaces import ISite
 from zope.app.component.site import LocalSiteManager
 from zope.app.utility import UtilityRegistration
 

Modified: zope.generic/trunk/src/zope/generic/testing/DEPENDENCIES.cfg
===================================================================
--- zope.generic/trunk/src/zope/generic/testing/DEPENDENCIES.cfg	2006-04-28 11:52:12 UTC (rev 67718)
+++ zope.generic/trunk/src/zope/generic/testing/DEPENDENCIES.cfg	2006-04-28 12:45:37 UTC (rev 67719)
@@ -1,4 +1,4 @@
-zope.app.annotation
+zope.annotation
 zope.app.component
 zope.app.security
 zope.app.testing

Modified: zope.generic/trunk/src/zope/generic/testing/testing.py
===================================================================
--- zope.generic/trunk/src/zope/generic/testing/testing.py	2006-04-28 11:52:12 UTC (rev 67718)
+++ zope.generic/trunk/src/zope/generic/testing/testing.py	2006-04-28 12:45:37 UTC (rev 67719)
@@ -105,10 +105,10 @@
 
 # specific tests
 def setUp(doctest=None):
-    # zope.app.annotations
-    from zope.app.annotation.interfaces import IAnnotations
-    from zope.app.annotation.interfaces import IAttributeAnnotatable
-    from zope.app.annotation.attribute import AttributeAnnotations
+    # zope.annotations
+    from zope.annotation.interfaces import IAnnotations
+    from zope.annotation.interfaces import IAttributeAnnotatable
+    from zope.annotation.attribute import AttributeAnnotations
 
     provideAdapter(AttributeAnnotations, adapts=[IAttributeAnnotatable], 
                    provides=IAnnotations)

Modified: zope.generic/trunk/src/zope/generic/type/DEPENDENCIES.cfg
===================================================================
--- zope.generic/trunk/src/zope/generic/type/DEPENDENCIES.cfg	2006-04-28 11:52:12 UTC (rev 67718)
+++ zope.generic/trunk/src/zope/generic/type/DEPENDENCIES.cfg	2006-04-28 12:45:37 UTC (rev 67719)
@@ -1,5 +1,5 @@
 persistent
-zope.app.annotation
+zope.annotation
 zope.app.container
 zope.app.folder
 zope.app.testing

Modified: zope.generic/trunk/src/zope/generic/type/README.txt
===================================================================
--- zope.generic/trunk/src/zope/generic/type/README.txt	2006-04-28 11:52:12 UTC (rev 67718)
+++ zope.generic/trunk/src/zope/generic/type/README.txt	2006-04-28 12:45:37 UTC (rev 67719)
@@ -180,7 +180,7 @@
     ...        acquire='True'
     ...        />
     ...    <handler
-    ...        event='zope.app.event.interfaces.IObjectEvent'
+    ...        event='zope.component.interfaces.IObjectEvent'
     ...        operations='example.objectEventHandler'
     ...        />
     ... </generic:type>
@@ -266,8 +266,8 @@
 
 Now we like to invoke an type-specific event handler:
 
-    >>> from zope.app.event.interfaces import IObjectEvent
-    >>> from zope.app.event.objectevent import ObjectEvent
+    >>> from zope.component.interfaces import IObjectEvent
+    >>> from zope.component.interfaces import ObjectEvent
     >>> from zope.event import notify
 
     >>> event = ObjectEvent(bar)

Modified: zope.generic/trunk/src/zope/generic/type/interfaces.py
===================================================================
--- zope.generic/trunk/src/zope/generic/type/interfaces.py	2006-04-28 11:52:12 UTC (rev 67718)
+++ zope.generic/trunk/src/zope/generic/type/interfaces.py	2006-04-28 12:45:37 UTC (rev 67719)
@@ -18,7 +18,7 @@
 
 __docformat__ = 'restructuredtext'
 
-from zope.app.annotation.interfaces import IAttributeAnnotatable
+from zope.annotation.interfaces import IAttributeAnnotatable
 from zope.app.i18n import ZopeMessageFactory as _
 from zope.interface import Interface
 from zope.schema import Object

Modified: zope.generic/trunk/src/zope/generic/type/testing.py
===================================================================
--- zope.generic/trunk/src/zope/generic/type/testing.py	2006-04-28 11:52:12 UTC (rev 67718)
+++ zope.generic/trunk/src/zope/generic/type/testing.py	2006-04-28 12:45:37 UTC (rev 67719)
@@ -18,10 +18,7 @@
 
 __docformat__ = 'restructuredtext'
 
-from zope.configuration.xmlconfig import XMLConfig
-
 import zope.app.testing.placelesssetup
-
 import zope.generic.adapter.testing
 import zope.generic.configuration.testing
 import zope.generic.directlyprovides.testing
@@ -31,6 +28,10 @@
 import zope.generic.operation.testing
 import zope.generic.testing.testing
 
+from zope.configuration.xmlconfig import XMLConfig
+
+
+
 ################################################################################
 #
 # Public Test implementations



More information about the Checkins mailing list