[Zope3-checkins] CVS: Zope3/src/zope/app/services - configuration.py:1.26.8.1

[Steve Alexander]

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

Modified Files:
      Tag: stevea-decorators-branch
	configuration.py 
Log Message:
Fixed some functional tests.


=== Zope3/src/zope/app/services/configuration.py 1.26 => 1.26.8.1 ===
--- Zope3/src/zope/app/services/configuration.py:1.26	Thu May  1 15:35:34 2003
+++ Zope3/src/zope/app/services/configuration.py	Mon May 19 09:28:07 2003
@@ -647,7 +647,6 @@
     def __delitem__(self, name):
         """Delete an item, but not if it's the last configuration manager
         """
-
         item = self[name]
         if IConfigurationManager.isImplementedBy(item):
             # Check to make sure it's not the last one
@@ -660,13 +659,14 @@
     def getConfigurationManager(self):
         """Get a configuration manager
         """
-
         # Get the configuration manager for this folder
         for name in self:
             item = self[name]
             if IConfigurationManager.isImplementedBy(item):
-                # We found one. Get it in context
-                return ContextWrapper(item, self, name=name)
+                # We found one. Get it in context.
+                # But, thanks to decoration, and the fact that this is a
+                # ContextMethod, it will already be in context.
+                return item
         else:
             raise NoConfigurationManagerError(
                 "Couldn't find an configuration manager")