[Zope3-checkins] CVS: Zope3/src/zope/app/adapter - adapter.py:1.3 configure.zcml:1.3 tests.py:1.3

[Stephan Richter]

Update of /cvs-repository/Zope3/src/zope/app/adapter
In directory cvs.zope.org:/tmp/cvs-serv27233/src/zope/app/adapter

Modified Files:
	adapter.py configure.zcml tests.py 
Log Message:


Moved registration code to zope.app.registration. Created module aliases, so
that old ZODBs work.


=== Zope3/src/zope/app/adapter/adapter.py 1.2 => 1.3 ===
--- Zope3/src/zope/app/adapter/adapter.py:1.2	Sat Mar 13 10:21:06 2004
+++ Zope3/src/zope/app/adapter/adapter.py	Sat Mar 13 13:01:03 2004
@@ -20,17 +20,17 @@
 from persistent.dict import PersistentDict
 from persistent import Persistent
 from zope.app import zapi
-from zope.app.services.registration import NotifyingRegistrationStack
+from zope.app.registration.registration import NotifyingRegistrationStack
 from zope.interface.adapter import adapterImplied, Default
 from zope.interface.adapter import Surrogate, AdapterRegistry
 import sys
 import zope.app.component.interfacefield
 import zope.app.component.nextservice
 import zope.app.container.contained
-import zope.app.interfaces.services.registration
+import zope.app.registration.interfaces
 import zope.app.site.interfaces
 import zope.app.security.permission
-import zope.app.services.registration
+import zope.app.registration
 import zope.component.interfaces
 import zope.interface
 import zope.schema
@@ -65,7 +65,7 @@
     """
 
     zope.interface.implements(
-        zope.app.interfaces.services.registration.IRegistry,
+        zope.app.registration.interfaces.IRegistry,
         )
     
     _surrogateClass = LocalSurrogate
@@ -228,7 +228,7 @@
 
 
 class IAdapterRegistration(
-    zope.app.interfaces.services.registration.IRegistration):
+    zope.app.registration.interfaces.IRegistration):
 
     required = zope.app.component.interfacefield.InterfaceField(
         title = u"For interface",
@@ -266,7 +266,8 @@
         "A sequence of factories to be called to construct the component"
         )
 
-class AdapterRegistration(zope.app.services.registration.SimpleRegistration):
+class AdapterRegistration(
+    zope.app.registration.registration.SimpleRegistration):
 
     zope.interface.implements(IAdapterRegistration)
 


=== Zope3/src/zope/app/adapter/configure.zcml 1.2 => 1.3 ===
--- Zope3/src/zope/app/adapter/configure.zcml:1.2	Tue Mar  9 08:36:31 2004
+++ Zope3/src/zope/app/adapter/configure.zcml	Sat Mar 13 13:01:03 2004
@@ -11,7 +11,7 @@
   <factory />
   <require
       permission="zope.ManageServices"
-      interface="zope.app.interfaces.services.registration.IRegistry"
+      interface="zope.app.registration.interfaces.IRegistry"
       attributes="getRegisteredMatching"
       />
 </content>


=== Zope3/src/zope/app/adapter/tests.py 1.2 => 1.3 ===
--- Zope3/src/zope/app/adapter/tests.py:1.2	Sat Mar 13 10:21:07 2004
+++ Zope3/src/zope/app/adapter/tests.py	Sat Mar 13 13:01:03 2004
@@ -890,7 +890,7 @@
 from ZODB.tests.util import DB
 from transaction import get_transaction
 from zope.app import zapi
-from zope.app.interfaces.services.registration import RegisteredStatus
+from zope.app.registration.interfaces import RegisteredStatus
 
 class IF0(zope.interface.Interface):
     pass