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

Jim Fulton jim@zope.com
Mon, 16 Dec 2002 16:56:33 -0500


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

Modified Files:
      Tag: AdapterAndView-branch
	ServiceManager.py 
Log Message:
Fixed bug in get method, which wasn't changed to reflect new
configuration framework.


=== Zope3/lib/python/Zope/App/OFS/Services/ServiceManager/ServiceManager.py 1.13 => 1.13.4.1 ===
--- Zope3/lib/python/Zope/App/OFS/Services/ServiceManager/ServiceManager.py:1.13	Mon Dec  9 10:22:20 2002
+++ Zope3/lib/python/Zope/App/OFS/Services/ServiceManager/ServiceManager.py	Mon Dec 16 16:56:33 2002
@@ -208,11 +208,11 @@
         if key == 'Packages':
             return self.Packages
 
-        directives = self.__bindings.get(key)
-        if directives and directives[0] is not None:
-            return self.queryService(key, default)
+        service = self.getBoundService(key)
+        if service is None:
+            return default
 
-        return default
+        return service
 
     get = ContextMethod(get)