[Zope3-checkins] CVS: Zope3/src/zope/component - service.py:1.5.2.2 servicenames.py:1.5.52.2

[Jim Fulton]

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

Modified Files:
      Tag: adaptergeddon-branch
	service.py servicenames.py 
Log Message:
Changed local site managers (aka service managers) to have next and
subSites attributes.  Now local service managers are linked up to make
it easier to navigate related sites.


=== Zope3/src/zope/component/service.py 1.5.2.1 => 1.5.2.2 ===
--- Zope3/src/zope/component/service.py:1.5.2.1	Tue Nov 11 11:04:12 2003
+++ Zope3/src/zope/component/service.py	Tue Nov 11 12:27:57 2003
@@ -56,11 +56,14 @@
     implements(IGlobalServiceManager)
 
     def __init__(self, name=None, module=None):
-        self.__defs     = {}
-        self.__services = {}
+        self._clear()
         self.__name__ = name
         self.__module__ = module
 
+    def _clear(self):
+        self.__defs     = {}
+        self.__services = {}
+
     def __reduce__(self):
         # Global service managers are pickled as global objects
         return self.__name__
@@ -108,7 +111,6 @@
 
         return self.__services.get(name, default)
 
-    _clear = __init__
 
 
 # the global service manager instance


=== Zope3/src/zope/component/servicenames.py 1.5.52.1 => 1.5.52.2 ===
--- Zope3/src/zope/component/servicenames.py:1.5.52.1	Sun Nov  9 11:08:31 2003
+++ Zope3/src/zope/component/servicenames.py	Tue Nov 11 12:27:57 2003
@@ -22,3 +22,4 @@
 Utilities = 'Utilities'
 Presentation = 'Presentation'
 Factories = 'Factories'
+Services = 'Services'