[z3-checkins] r18361 - in z3/sqlos/branch/jinty-Five: . container

[jinty at codespeak.net]

Author: jinty
Date: Tue Oct 11 09:12:46 2005
New Revision: 18361

Modified:
   z3/sqlos/branch/jinty-Five/connection.py
   z3/sqlos/branch/jinty-Five/container/__init__.py
Log:
Remove the context parameter from utility lookups.

This appears to be broken under Five, removing it makes the tests of my
sqlos/Five product work and doesn't break any sqlos tests.

Perhaps it should break sqlos tests...


Modified: z3/sqlos/branch/jinty-Five/connection.py
==============================================================================
--- z3/sqlos/branch/jinty-Five/connection.py	(original)
+++ z3/sqlos/branch/jinty-Five/connection.py	Tue Oct 11 09:12:46 2005
@@ -31,7 +31,7 @@
         name = self.name
         if name is None:
             try:
-                ut = zapi.getUtility(IConnectionName, context=context)
+                ut = zapi.getUtility(IConnectionName)
             except ComponentLookupError:
                 return self
             if ut is None:
@@ -62,8 +62,7 @@
         global connCache
         if not connCache.get(name):
             newconn = zapi.queryUtility(IZopeDatabaseAdapter, name,
-                                        default=None,
-                                        context=context)
+                                        default=None)
             if newconn is None:
                 warnings.warn("Couldn't find a rdb connection by the "
                               "name %s. Please verify your setup." % name,
@@ -83,8 +82,7 @@
         key = (tid, name)
         if not connCache.get(key):
             newconn = zapi.queryUtility(IZopeDatabaseAdapter, name,
-                                        default=None,
-                                        context=context)
+                                        default=None)
             if newconn is None:
                 warnings.warn("Couldn't find a rdb connection by the "
                               "name %s. Please verify your setup." % name,

Modified: z3/sqlos/branch/jinty-Five/container/__init__.py
==============================================================================
--- z3/sqlos/branch/jinty-Five/container/__init__.py	(original)
+++ z3/sqlos/branch/jinty-Five/container/__init__.py	Tue Oct 11 09:12:46 2005
@@ -69,7 +69,7 @@
         pass
 
     def allowedFactories(self):
-        items = zapi.getFactoriesFor(ISQLObject, context=self)
+        items = zapi.getFactoriesFor(ISQLObject)
         names = [name for name, factory in items]
         f = lambda name: (name, zapi.getUtility(IFactory, name))
         factories = map(f, names)