[z3-checkins] r33683 - in z3/sqlos/trunk: Zope2/FiveSQLOS src/sqlos src/sqlos/ftests src/sqlos/testing

[jinty at codespeak.net]

Author: jinty
Date: Tue Oct 24 20:39:07 2006
New Revision: 33683

Modified:
   z3/sqlos/trunk/Zope2/FiveSQLOS/README.txt
   z3/sqlos/trunk/Zope2/FiveSQLOS/dependencies-meta.zcml
   z3/sqlos/trunk/src/sqlos/adapter.py
   z3/sqlos/trunk/src/sqlos/connection.py
   z3/sqlos/trunk/src/sqlos/ftesting.zcml
   z3/sqlos/trunk/src/sqlos/ftests/localutilities.txt
   z3/sqlos/trunk/src/sqlos/ftests/test_transaction.py
   z3/sqlos/trunk/src/sqlos/testing/testdb.py
Log:
zope.app.rdb -> zope.rdb

Modified: z3/sqlos/trunk/Zope2/FiveSQLOS/README.txt
==============================================================================
--- z3/sqlos/trunk/Zope2/FiveSQLOS/README.txt	(original)
+++ z3/sqlos/trunk/Zope2/FiveSQLOS/README.txt	Tue Oct 24 20:39:07 2006
@@ -34,10 +34,10 @@
     >>> from Products.Five import zcml
     >>> import sqlos
     >>> import Products.FiveSQLOS
-    >>> import zope.app.rdb
+    >>> import zope.rdb
     >>> zcml.load_config('configure.zcml', package=Products.Five)
     >>> zcml.load_config('meta.zcml', package=Products.FiveSQLOS)
-    >>> zcml.load_config('meta.zcml', package=zope.app.rdb)
+    >>> zcml.load_config('meta.zcml', package=zope.rdb)
     >>> zcml.load_config('meta.zcml', package=sqlos)
     >>> zcml.load_config('configure.zcml', package=Products.FiveSQLOS)
     >>> zcml.load_config('configure.zcml', package=sqlos)

Modified: z3/sqlos/trunk/Zope2/FiveSQLOS/dependencies-meta.zcml
==============================================================================
--- z3/sqlos/trunk/Zope2/FiveSQLOS/dependencies-meta.zcml	(original)
+++ z3/sqlos/trunk/Zope2/FiveSQLOS/dependencies-meta.zcml	Tue Oct 24 20:39:07 2006
@@ -12,7 +12,7 @@
   <include package="zope.app.component" file="meta.zcml"/>
   <include package="zope.app.security" file="meta.zcml"/>
   <include package="zope.app" file="menus.zcml"/>
-  <include package="zope.app.rdb" file="meta.zcml"/>
+  <include package="zope.rdb" file="meta.zcml"/>
   <include package="sqlos" file="meta.zcml"/>
 
   <!-- XXX - remove when we break compatibility with Five 1.3-->

Modified: z3/sqlos/trunk/src/sqlos/adapter.py
==============================================================================
--- z3/sqlos/trunk/src/sqlos/adapter.py	(original)
+++ z3/sqlos/trunk/src/sqlos/adapter.py	Tue Oct 24 20:39:07 2006
@@ -21,7 +21,7 @@
 from sqlobject import _mysql, _postgres, _sqlite
 from sqlobject.converters import registerConverter
 from sqlobject.mysql import mysqlconnection
-from zope.app.rdb.interfaces import DatabaseException
+from zope.rdb.interfaces import DatabaseException
 from zope.app.container.interfaces import INameChooser
 from zope.interface import implements
 
@@ -54,12 +54,12 @@
 
     def getConnection(self):
         # we override this because we really don't care about sqlobjects idea
-        # of threadsafe pool of db connections. zope.app.rdb takes care of
+        # of threadsafe pool of db connections. zope.rdb takes care of
         # that for us
         return self.makeConnection()
 
     def releaseConnection(self, conn, explicit=False):
-        # we simply lobotomize this method because zope.app.rdb
+        # we simply lobotomize this method because zope.rdb
         # takes care of all commits/rollbacks as well as all threading issues
         # with connections
         pass

Modified: z3/sqlos/trunk/src/sqlos/connection.py
==============================================================================
--- z3/sqlos/trunk/src/sqlos/connection.py	(original)
+++ z3/sqlos/trunk/src/sqlos/connection.py	Tue Oct 24 20:39:07 2006
@@ -25,7 +25,7 @@
 
 from zope.component import ComponentLookupError
 import zope.component
-from zope.app.rdb.interfaces import IZopeDatabaseAdapter
+from zope.rdb.interfaces import IZopeDatabaseAdapter
 from zope.thread import local
 
 from sqlos.interfaces import IZopeSQLConnection, IConnectionName
@@ -52,7 +52,7 @@
 
     This subscriber serves a dual purpose. Firstly it makes sure that local
     sites will work with the cache. Secondly it ensures that the cached
-    connections are not kept around forever, allowing zope.app.rdb to
+    connections are not kept around forever, allowing zope.rdb to
     recover from problems such as [1].
 
     Subscribed to BeforeTraverseEvent and EndTraverseEvent.

Modified: z3/sqlos/trunk/src/sqlos/ftesting.zcml
==============================================================================
--- z3/sqlos/trunk/src/sqlos/ftesting.zcml	(original)
+++ z3/sqlos/trunk/src/sqlos/ftesting.zcml	Tue Oct 24 20:39:07 2006
@@ -15,7 +15,7 @@
 
   <adapter
       provides=".interfaces.IZopeSQLConnection"
-      for="zope.app.rdb.interfaces.IZopeConnection"
+      for="zope.rdb.interfaces.IZopeConnection"
       permission="zope.Public"
       factory=".adapter.SQLiteAdapter"
       />

Modified: z3/sqlos/trunk/src/sqlos/ftests/localutilities.txt
==============================================================================
--- z3/sqlos/trunk/src/sqlos/ftests/localutilities.txt	(original)
+++ z3/sqlos/trunk/src/sqlos/ftests/localutilities.txt	Tue Oct 24 20:39:07 2006
@@ -30,7 +30,7 @@
 
 Now we set up a local database utility
 
-    >>> from zope.app.rdb.interfaces import IZopeDatabaseAdapter
+    >>> from zope.rdb.interfaces import IZopeDatabaseAdapter
     >>> from zope.app.component.interfaces.registration import ActiveStatus
     >>> from sqlos.testing.testdb import SQLiteda
     >>> from zope.app.utility import UtilityRegistration

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	Tue Oct 24 20:39:07 2006
@@ -17,7 +17,7 @@
 from transaction import get, begin
 from zope.app.testing.functional import BrowserTestCase
 import zope.component
-from zope.app.rdb.interfaces import IZopeDatabaseAdapter
+from zope.rdb.interfaces import IZopeDatabaseAdapter
 
 from sqlos.interfaces import IConnectionName
 from sqlos.testing.sampleperson import SamplePerson

Modified: z3/sqlos/trunk/src/sqlos/testing/testdb.py
==============================================================================
--- z3/sqlos/trunk/src/sqlos/testing/testdb.py	(original)
+++ z3/sqlos/trunk/src/sqlos/testing/testdb.py	Tue Oct 24 20:39:07 2006
@@ -18,7 +18,7 @@
 import urlparse
 
 import transaction
-from zope.app.rdb import ZopeDatabaseAdapter
+from zope.rdb import ZopeDatabaseAdapter
 
 from sqlos.adapter import SQLiteAdapter