[Zope3-checkins] CVS: Zope3/src/zope/component - adapter.py:1.7 presentation.py:1.8

[Jim Fulton]

Update of /cvs-repository/Zope3/src/zope/component
In directory cvs.zope.org:/tmp/cvs-serv4511/src/zope/component

Modified Files:
	adapter.py presentation.py 
Log Message:
Removed the old adapter registry code.

Renamed the surrogate registry to AdapterRegistry and moved the
surrogate code to zope.interface.adapter.

Removed the old surrogate module.


=== Zope3/src/zope/component/adapter.py 1.6 => 1.7 ===
--- Zope3/src/zope/component/adapter.py:1.6	Tue Dec 16 05:25:25 2003
+++ Zope3/src/zope/component/adapter.py	Mon Mar  8 12:26:56 2004
@@ -17,7 +17,7 @@
 __metaclass__ = type
 import sys
 from zope.interface import implements
-from zope.interface.surrogate import SurrogateRegistry
+from zope.interface.adapter import AdapterRegistry
 from zope.component.exceptions import ComponentLookupError
 from zope.component.interfaces import IAdapterService
 from zope.component.service import GlobalService
@@ -60,7 +60,7 @@
           - registered data
         """
 
-class GlobalAdapterService(SurrogateRegistry, GlobalService):
+class GlobalAdapterService(AdapterRegistry, GlobalService):
 
     implements(IGlobalAdapterService)
 


=== Zope3/src/zope/component/presentation.py 1.7 => 1.8 ===
--- Zope3/src/zope/component/presentation.py:1.7	Fri Mar  5 17:09:25 2004
+++ Zope3/src/zope/component/presentation.py	Mon Mar  8 12:26:56 2004
@@ -24,7 +24,7 @@
 import zope.interface
 from zope.interface.interfaces import IInterface
 import zope.schema
-import zope.interface.surrogate
+import zope.interface.adapter
 from types import ClassType
 
 
@@ -510,10 +510,10 @@
 def GU(presentation_service, usage_name):
     return presentation_service.queryUsage(usage_name)
 
-class GlobalLayer(zope.interface.surrogate.SurrogateRegistry):
+class GlobalLayer(zope.interface.adapter.AdapterRegistry):
 
     def __init__(self, parent, name):
-        zope.interface.surrogate.SurrogateRegistry.__init__(self)
+        zope.interface.adapter.AdapterRegistry.__init__(self)
         self.__parent__ = parent
         self.__name__ = name
 
@@ -521,10 +521,10 @@
         return GL, (self.__parent__, self.__name__)
 
 
-class GlobalUsage(zope.interface.surrogate.SurrogateRegistry):
+class GlobalUsage(zope.interface.adapter.AdapterRegistry):
 
     def __init__(self, parent, name):
-        zope.interface.surrogate.SurrogateRegistry.__init__(self)
+        zope.interface.adapter.AdapterRegistry.__init__(self)
         self.__parent__ = parent
         self.__name__ = name