[Zope3-checkins] CVS: Zope3/lib/python/Zope/App/OFS/Services/ConnectionService - ConnectionService.py:1.9

[Steve Alexander]

Update of /cvs-repository/Zope3/lib/python/Zope/App/OFS/Services/ConnectionService
In directory cvs.zope.org:/tmp/cvs-serv12654/lib/python/Zope/App/OFS/Services/ConnectionService

Modified Files:
	ConnectionService.py 
Log Message:
SteveA and Marius G.

We refactored the NamedComponentConfiguration and ComponentConfiguration.
Now, we have NamedConfiguration and NamedComponentConfiguration.

NamedConfigurable is now split into two parts, as appropriate to that
refactoring.

Cleaned up various extraneous imports, and changed various 
self --> wrapped_self. (Interestingly, this act revealed one ContextMethod
that did not in fact need to be a ContextMethod.)
 


=== Zope3/lib/python/Zope/App/OFS/Services/ConnectionService/ConnectionService.py 1.8 => 1.9 ===
--- Zope3/lib/python/Zope/App/OFS/Services/ConnectionService/ConnectionService.py:1.8	Thu Dec 12 10:28:17 2002
+++ Zope3/lib/python/Zope/App/OFS/Services/ConnectionService/ConnectionService.py	Wed Dec 18 15:23:05 2002
@@ -18,16 +18,17 @@
 from Persistence import Persistent
 from Zope.ContextWrapper import ContextMethod
 from Zope.App.ComponentArchitecture.NextService import queryNextService
-from Zope.App.OFS.Services.ConfigurationInterfaces import INameConfigurable
-from Zope.App.OFS.Services.Configuration import NameConfigurable
+from Zope.App.OFS.Services.ConfigurationInterfaces \
+        import INameComponentConfigurable
+from Zope.App.OFS.Services.Configuration import NameComponentConfigurable
 from Zope.App.RDB.IConnectionService import IConnectionService
 
 
-class ILocalConnectionService(IConnectionService, INameConfigurable):
+class ILocalConnectionService(IConnectionService, INameComponentConfigurable):
     """A local (placeful) connection service"""
 
 
-class ConnectionService(Persistent, NameConfigurable):
+class ConnectionService(Persistent, NameComponentConfigurable):
 
     __doc__ = ILocalConnectionService.__doc__
 
@@ -35,8 +36,6 @@
 
     def __init__(self):
         super(ConnectionService, self).__init__()
-        NameConfigurable.__init__(self)
-
 
     def getConnection(self, name):
         'See Zope.App.RDB.IConnectionService.IConnectionService'