[z3-checkins] r25469 - in z3/sqlos/trunk/src/sqlos: . auth ftests
jinty at codespeak.net
jinty at codespeak.net
Fri Apr 7 02:17:11 CEST 2006
Author: jinty
Date: Fri Apr 7 02:17:08 2006
New Revision: 25469
Modified:
z3/sqlos/trunk/src/sqlos/__init__.py
z3/sqlos/trunk/src/sqlos/auth/__init__.py
z3/sqlos/trunk/src/sqlos/connection.py
z3/sqlos/trunk/src/sqlos/container.py
z3/sqlos/trunk/src/sqlos/ftests/test_transaction.py
Log:
Remove users of zapi.
Modified: z3/sqlos/trunk/src/sqlos/__init__.py
==============================================================================
--- z3/sqlos/trunk/src/sqlos/__init__.py (original)
+++ z3/sqlos/trunk/src/sqlos/__init__.py Fri Apr 7 02:17:08 2006
@@ -13,7 +13,7 @@
__metaclass__ = type
from datetime import datetime, date
-from zope.app import zapi
+import zope.component
from sqlobject.sqlbuilder import registerConverter
from _sqlos import SQLOS
@@ -41,14 +41,14 @@
def getFactory(name, context=None, default=None):
# XXX - deprecated, goes away after sqlos 0.2
- return zapi.queryUtility(IISQLObject, name, default=default, context=context)
+ return zope.component.queryUtility(IISQLObject, name, default=default, context=context)
from zope.deprecation import deprecated
msg = "getFactory is depreciated and will go away after sqlos 0.2 you should \
replace this with a direct call to \
-zapi.getUtility(IISQLObject, name, context=context) if you need the \
+zope.component.getUtility(IISQLObject, name, context=context) if you need the \
functionailty of a SQLObject class, or \
-zapi.getUtility(IFactory, name, context=context) if you want to use it as a \
+zope.component.getUtility(IFactory, name, context=context) if you want to use it as a \
factory."
deprecated("getFactory", msg)
Modified: z3/sqlos/trunk/src/sqlos/auth/__init__.py
==============================================================================
--- z3/sqlos/trunk/src/sqlos/auth/__init__.py (original)
+++ z3/sqlos/trunk/src/sqlos/auth/__init__.py Fri Apr 7 02:17:08 2006
@@ -13,7 +13,7 @@
from zope.interface import implements
-from zope.app import zapi
+import zope.component
from zope.app.pluggableauth.interfaces import ILoginPasswordPrincipalSource
from zope.app.pluggableauth import SimplePrincipal
Modified: z3/sqlos/trunk/src/sqlos/connection.py
==============================================================================
--- z3/sqlos/trunk/src/sqlos/connection.py (original)
+++ z3/sqlos/trunk/src/sqlos/connection.py Fri Apr 7 02:17:08 2006
@@ -15,7 +15,7 @@
import warnings
from zope.component import ComponentLookupError
-from zope.app import zapi
+import zope.component
from zope.app.rdb.interfaces import IZopeDatabaseAdapter
from zope.thread import local
@@ -79,7 +79,7 @@
name = self.name
if name is None:
try:
- ut = zapi.getUtility(IConnectionName)
+ ut = zope.component.getUtility(IConnectionName)
except ComponentLookupError:
return self
if ut is None:
@@ -91,7 +91,7 @@
# try get the connection from the cache, or make a new one
conn = conn_cache.queryConnection(name)
if conn is None:
- zda = zapi.getUtility(IZopeDatabaseAdapter, name)
+ zda = zope.component.getUtility(IZopeDatabaseAdapter, name)
try:
conn = IZopeSQLConnection(zda())
except ComponentLookupError:
Modified: z3/sqlos/trunk/src/sqlos/container.py
==============================================================================
--- z3/sqlos/trunk/src/sqlos/container.py (original)
+++ z3/sqlos/trunk/src/sqlos/container.py Fri Apr 7 02:17:08 2006
@@ -18,7 +18,7 @@
from zope.interface import implements
from zope.component import IFactory
from zope import deprecation
-from zope.app import zapi
+import zope.component
from zope.app.container.interfaces import IContained
from zope.app.container.contained import ContainedProxy
from zope.app.container.contained import Contained
@@ -65,10 +65,10 @@
if ISQLObject.providedBy(obj):
# Look for the SQLObject class our object is from, so get all
# allowed factories
- for name, factory in zapi.getFactoriesFor(ISQLObject):
+ for name, factory in zope.component.getFactoriesFor(ISQLObject):
if checkFactory(self.context, None, factory):
# get the sqlobject class
- utility = zapi.queryUtility(IISQLObject, name)
+ utility = zope.component.queryUtility(IISQLObject, name)
if utility is None:
continue
if obj.sqlmeta.table == utility.sqlmeta.table:
@@ -87,7 +87,7 @@
pass
def _allowedFactories(self):
- for name, factory in zapi.getFactoriesFor(ISQLObject):
+ for name, factory in zope.component.getFactoriesFor(ISQLObject):
if checkFactory(self, None, factory):
yield name
allowedFactories = deprecation.deprecated(_allowedFactories,
@@ -95,9 +95,9 @@
' please use _getAllowedIISQLObjectUtilities instead.')
def _getAllowedIISQLObjectUtilities(self):
- for name, factory in zapi.getFactoriesFor(ISQLObject):
+ for name, factory in zope.component.getFactoriesFor(ISQLObject):
if checkFactory(self, None, factory):
- utility = zapi.queryUtility(IISQLObject, name)
+ utility = zope.component.queryUtility(IISQLObject, name)
# Someone might have registered a factory implementing
# IISQLObject using <zope:factory> for whatever reason.
# in this case queryUtility returns None and we can just
@@ -212,7 +212,7 @@
def allowedFactories(self):
# Ignore all factories not implementing ISQLObjectIsolated
for f in SQLObjectContainer._allowedFactories(self):
- implemented = zapi.getFactoryInterfaces(f)
+ implemented = zope.component.getFactoryInterfaces(f)
if implemented.isOrExtends(ISQLObjectIsolated):
yield f
allowedFactories = deprecation.deprecated(allowedFactories,
Modified: z3/sqlos/trunk/src/sqlos/ftests/test_transaction.py
==============================================================================
--- z3/sqlos/trunk/src/sqlos/ftests/test_transaction.py (original)
+++ z3/sqlos/trunk/src/sqlos/ftests/test_transaction.py Fri Apr 7 02:17:08 2006
@@ -16,7 +16,7 @@
from transaction import get, begin
from zope.app.testing.functional import BrowserTestCase
-from zope.app import zapi
+import zope.component
from zope.app.rdb.interfaces import IZopeDatabaseAdapter
from sqlos.interfaces import IConnectionName
@@ -98,8 +98,8 @@
This is a regression test for if the cache makes breaks the isolation
between threads.
"""
- ut = zapi.getUtility(IConnectionName)
- adapter = zapi.queryUtility(IZopeDatabaseAdapter, ut.name)
+ ut = zope.component.getUtility(IConnectionName)
+ adapter = zope.component.queryUtility(IZopeDatabaseAdapter, ut.name)
if adapter.getDSN() == 'dbi://:memory:':
import warnings
warnings.warn('Warning, not testing Cache Isolation')
@@ -130,8 +130,8 @@
happen even if the thread is not the main thread. (Just in case some
dodo only registers the cache clearer in the main thread.)
"""
- ut = zapi.getUtility(IConnectionName)
- adapter = zapi.queryUtility(IZopeDatabaseAdapter, ut.name)
+ ut = zope.component.getUtility(IConnectionName)
+ adapter = zope.component.queryUtility(IZopeDatabaseAdapter, ut.name)
if adapter.getDSN() == 'dbi://:memory:':
import warnings
warnings.warn('Warning, not testing Cache Isolation')
More information about the z3-checkins
mailing list