[Checkins] SVN: Zope3/branches/jim-adapter/src/zope/rdb/ Convert all zope.app.rdb importers inside zope.rdb to use zope.rdb, and fix a test that broke bcause of this.

Brian Sutherland jinty at web.de
Tue Apr 11 13:32:51 EDT 2006


Log message for revision 66859:
  Convert all zope.app.rdb importers inside zope.rdb to use zope.rdb, and fix a test that broke bcause of this.

Changed:
  U   Zope3/branches/jim-adapter/src/zope/rdb/__init__.py
  U   Zope3/branches/jim-adapter/src/zope/rdb/browser/configure.zcml
  U   Zope3/branches/jim-adapter/src/zope/rdb/browser/gadflyda.py
  U   Zope3/branches/jim-adapter/src/zope/rdb/browser/gadflyda.zcml
  U   Zope3/branches/jim-adapter/src/zope/rdb/browser/rdb.py
  U   Zope3/branches/jim-adapter/src/zope/rdb/configure.zcml
  U   Zope3/branches/jim-adapter/src/zope/rdb/gadflyda.py
  U   Zope3/branches/jim-adapter/src/zope/rdb/gadflyda.zcml
  U   Zope3/branches/jim-adapter/src/zope/rdb/gadflymeta.py
  U   Zope3/branches/jim-adapter/src/zope/rdb/metaconfigure.py
  U   Zope3/branches/jim-adapter/src/zope/rdb/tests/gadflyroot.zcml
  U   Zope3/branches/jim-adapter/src/zope/rdb/tests/rdb.zcml
  U   Zope3/branches/jim-adapter/src/zope/rdb/tests/test_directives.py
  U   Zope3/branches/jim-adapter/src/zope/rdb/tests/test_doctests.py
  U   Zope3/branches/jim-adapter/src/zope/rdb/tests/test_dsnparser.py
  U   Zope3/branches/jim-adapter/src/zope/rdb/tests/test_gadflyadapter.py
  U   Zope3/branches/jim-adapter/src/zope/rdb/tests/test_gadflyphantom.py
  U   Zope3/branches/jim-adapter/src/zope/rdb/tests/test_gadflyrootdirective.py
  U   Zope3/branches/jim-adapter/src/zope/rdb/tests/test_resultset.py
  U   Zope3/branches/jim-adapter/src/zope/rdb/tests/test_row.py
  U   Zope3/branches/jim-adapter/src/zope/rdb/tests/test_zopeconnection.py
  U   Zope3/branches/jim-adapter/src/zope/rdb/tests/test_zopecursor.py
  U   Zope3/branches/jim-adapter/src/zope/rdb/tests/test_zopedatabaseadapter.py
  U   Zope3/branches/jim-adapter/src/zope/rdb/tests/test_zopedbtransactionmanager.py

-=-
Modified: Zope3/branches/jim-adapter/src/zope/rdb/__init__.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/rdb/__init__.py	2006-04-11 17:19:39 UTC (rev 66858)
+++ Zope3/branches/jim-adapter/src/zope/rdb/__init__.py	2006-04-11 17:32:49 UTC (rev 66859)
@@ -32,10 +32,10 @@
 
 from zope.interface import implements
 from zope.app.container.contained import Contained
-from zope.app.rdb.interfaces import DatabaseException, DatabaseAdapterError
-from zope.app.rdb.interfaces import IResultSet
-from zope.app.rdb.interfaces import IZopeConnection, IZopeCursor
-from zope.app.rdb.interfaces import IManageableZopeDatabaseAdapter
+from zope.rdb.interfaces import DatabaseException, DatabaseAdapterError
+from zope.rdb.interfaces import IResultSet
+from zope.rdb.interfaces import IZopeConnection, IZopeCursor
+from zope.rdb.interfaces import IManageableZopeDatabaseAdapter
 from zope.thread import local
 
 

Modified: Zope3/branches/jim-adapter/src/zope/rdb/browser/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/rdb/browser/configure.zcml	2006-04-11 17:19:39 UTC (rev 66858)
+++ Zope3/branches/jim-adapter/src/zope/rdb/browser/configure.zcml	2006-04-11 17:32:49 UTC (rev 66859)
@@ -3,7 +3,7 @@
    xmlns="http://namespaces.zope.org/browser">
 
   <tool
-      interface="zope.app.rdb.interfaces.IZopeDatabaseAdapter"
+      interface="zope.rdb.interfaces.IZopeDatabaseAdapter"
       title="Database Adapter"
       description="Database Adapters are used to connect to external
       relational databases."
@@ -15,12 +15,12 @@
 
   <view
       name="+"
-      for="zope.app.rdb.interfaces.IZopeDatabaseAdapter"
+      for="zope.rdb.interfaces.IZopeDatabaseAdapter"
       class="zope.app.container.browser.adding.Adding"
       permission="zope.ManageServices" />
 
   <pages
-      for="zope.app.rdb.interfaces.IManageableZopeDatabaseAdapter"
+      for="zope.rdb.interfaces.IManageableZopeDatabaseAdapter"
       permission="zope.ManageServices"
       class=".rdb.Connection">
 
@@ -33,7 +33,7 @@
   </pages>
 
   <pages
-      for="zope.app.rdb.interfaces.IManageableZopeDatabaseAdapter"
+      for="zope.rdb.interfaces.IManageableZopeDatabaseAdapter"
       permission="zope.ManageServices"
       class=".rdb.TestSQL">
     <page name="testForm.html" template="rdbtestsql.pt"
@@ -43,7 +43,7 @@
   </pages>
 
   <defaultView 
-      for="zope.app.rdb.interfaces.IManageableZopeDatabaseAdapter"
+      for="zope.rdb.interfaces.IManageableZopeDatabaseAdapter"
       name="editForm.html" />
 
   <zope:include file="gadflyda.zcml" />

Modified: Zope3/branches/jim-adapter/src/zope/rdb/browser/gadflyda.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/rdb/browser/gadflyda.py	2006-04-11 17:19:39 UTC (rev 66858)
+++ Zope3/branches/jim-adapter/src/zope/rdb/browser/gadflyda.py	2006-04-11 17:32:49 UTC (rev 66859)
@@ -15,7 +15,7 @@
 
 $Id$
 """
-from zope.app.rdb.browser.rdb import AdapterAdd
+from zope.rdb.browser.rdb import AdapterAdd
 
 class GadflyDAAddView(AdapterAdd):
     """Provide a user interface for adding a Gadfly DA"""

Modified: Zope3/branches/jim-adapter/src/zope/rdb/browser/gadflyda.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/rdb/browser/gadflyda.zcml	2006-04-11 17:19:39 UTC (rev 66858)
+++ Zope3/branches/jim-adapter/src/zope/rdb/browser/gadflyda.zcml	2006-04-11 17:32:49 UTC (rev 66859)
@@ -4,9 +4,9 @@
 
   <addform
       name="AddGadflyDA"
-      schema="zope.app.rdb.interfaces.IManageableZopeDatabaseAdapter"
+      schema="zope.rdb.interfaces.IManageableZopeDatabaseAdapter"
       label="Add Gadfly Database Adapter"
-      content_factory="zope.app.rdb.gadflyda.GadflyAdapter"
+      content_factory="zope.rdb.gadflyda.GadflyAdapter"
       arguments="dsn"
       fields="dsn"
       permission="zope.ManageContent" />
@@ -14,7 +14,7 @@
   <addMenuItem
     title="Gadfly DA" 
     description="A DA for the built-in 100% Pure Python Gadfly Database"
-    class="zope.app.rdb.gadflyda.GadflyAdapter"
+    class="zope.rdb.gadflyda.GadflyAdapter"
     permission="zope.ManageServices"
     view="AddGadflyDA"
   />

Modified: Zope3/branches/jim-adapter/src/zope/rdb/browser/rdb.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/rdb/browser/rdb.py	2006-04-11 17:19:39 UTC (rev 66858)
+++ Zope3/branches/jim-adapter/src/zope/rdb/browser/rdb.py	2006-04-11 17:32:49 UTC (rev 66859)
@@ -15,8 +15,8 @@
 
 $Id$
 """
-from zope.app.rdb.interfaces import IManageableZopeDatabaseAdapter
-from zope.app.rdb import queryForResults
+from zope.rdb.interfaces import IManageableZopeDatabaseAdapter
+from zope.rdb import queryForResults
 
 class TestSQL(object):
 

Modified: Zope3/branches/jim-adapter/src/zope/rdb/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/rdb/configure.zcml	2006-04-11 17:19:39 UTC (rev 66858)
+++ Zope3/branches/jim-adapter/src/zope/rdb/configure.zcml	2006-04-11 17:32:49 UTC (rev 66859)
@@ -4,40 +4,40 @@
     >
 
   <permission
-      id="zope.app.rdb.Use"
-      title="[zope.app.rdb.Use] Use Database Connections"
+      id="zope.rdb.Use"
+      title="[zope.rdb.Use] Use Database Connections"
       />
 
-  <class class="zope.app.rdb.ZopeConnection">
+  <class class="zope.rdb.ZopeConnection">
     <require
         permission="zope.ManageContent"
-        interface="zope.app.rdb.interfaces.IZopeConnection"
+        interface="zope.rdb.interfaces.IZopeConnection"
         />
   </class>
 
-  <class class="zope.app.rdb.ZopeCursor">
+  <class class="zope.rdb.ZopeCursor">
     <require
         permission="zope.ManageContent"
-        interface="zope.app.rdb.interfaces.IZopeCursor"
+        interface="zope.rdb.interfaces.IZopeCursor"
         />
   </class>
 
-  <class class="zope.app.rdb.Row">
+  <class class="zope.rdb.Row">
     <require
         permission="zope.ManageContent"
         attributes="__getattr__"
         />
   </class>
 
-  <localUtility class="zope.app.rdb.ZopeDatabaseAdapter">
+  <localUtility class="zope.rdb.ZopeDatabaseAdapter">
 
     <require
-        permission="zope.app.rdb.Use"
-        interface="zope.app.rdb.interfaces.IZopeDatabaseAdapter" />
+        permission="zope.rdb.Use"
+        interface="zope.rdb.interfaces.IZopeDatabaseAdapter" />
 
   </localUtility>
 
-  <class class="zope.app.rdb.ResultSet">
+  <class class="zope.rdb.ResultSet">
     <!-- require zope.View for all list methods -->
     <require
         permission="zope.View"

Modified: Zope3/branches/jim-adapter/src/zope/rdb/gadflyda.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/rdb/gadflyda.py	2006-04-11 17:19:39 UTC (rev 66858)
+++ Zope3/branches/jim-adapter/src/zope/rdb/gadflyda.py	2006-04-11 17:32:49 UTC (rev 66859)
@@ -18,9 +18,9 @@
 import gadfly
 import os
 
-from zope.app.rdb import ZopeDatabaseAdapter, parseDSN
-from zope.app.rdb import DatabaseException, DatabaseAdapterError
-from zope.app.rdb import ZopeConnection, ZopeCursor
+from zope.rdb import ZopeDatabaseAdapter, parseDSN
+from zope.rdb import DatabaseException, DatabaseAdapterError
+from zope.rdb import ZopeConnection, ZopeCursor
 
 GadflyError = DatabaseAdapterError
 

Modified: Zope3/branches/jim-adapter/src/zope/rdb/gadflyda.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/rdb/gadflyda.zcml	2006-04-11 17:19:39 UTC (rev 66858)
+++ Zope3/branches/jim-adapter/src/zope/rdb/gadflyda.zcml	2006-04-11 17:32:49 UTC (rev 66859)
@@ -1,24 +1,24 @@
 <configure xmlns="http://namespaces.zope.org/zope">
 
-  <class class="zope.app.rdb.gadflyda.GadflyAdapter">
+  <class class="zope.rdb.gadflyda.GadflyAdapter">
     <factory
         title="Gadfly Database Adapter" />
     <require
-        permission="zope.app.rdb.Use"
-        interface="zope.app.rdb.interfaces.IZopeDatabaseAdapter" />
+        permission="zope.rdb.Use"
+        interface="zope.rdb.interfaces.IZopeDatabaseAdapter" />
     <require
         permission="zope.ManageServices"
-        interface="zope.app.rdb.interfaces.IZopeDatabaseAdapterManagement" />
+        interface="zope.rdb.interfaces.IZopeDatabaseAdapterManagement" />
   </class>
 
-  <class class="zope.app.rdb.gadflyda.GadflyAdapterCursor">
+  <class class="zope.rdb.gadflyda.GadflyAdapterCursor">
     <allow
-        interface="zope.app.rdb.interfaces.IZopeCursor" />
+        interface="zope.rdb.interfaces.IZopeCursor" />
   </class>
 
-  <class class="zope.app.rdb.gadflyda.GadflyAdapterConnection">
+  <class class="zope.rdb.gadflyda.GadflyAdapterConnection">
     <allow
-        interface="zope.app.rdb.interfaces.IZopeConnection" />
+        interface="zope.rdb.interfaces.IZopeConnection" />
   </class>
 
 </configure>

Modified: Zope3/branches/jim-adapter/src/zope/rdb/gadflymeta.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/rdb/gadflymeta.py	2006-04-11 17:19:39 UTC (rev 66858)
+++ Zope3/branches/jim-adapter/src/zope/rdb/gadflymeta.py	2006-04-11 17:32:49 UTC (rev 66859)
@@ -18,7 +18,7 @@
 from zope.configuration.fields import Path
 from zope.interface import Interface
 
-from zope.app.rdb.gadflyda import setGadflyRoot 
+from zope.rdb.gadflyda import setGadflyRoot 
 
 class IGadflyRoot(Interface):
     """This directive creates a globale connection to an RDBMS."""

Modified: Zope3/branches/jim-adapter/src/zope/rdb/metaconfigure.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/rdb/metaconfigure.py	2006-04-11 17:19:39 UTC (rev 66858)
+++ Zope3/branches/jim-adapter/src/zope/rdb/metaconfigure.py	2006-04-11 17:32:49 UTC (rev 66859)
@@ -16,7 +16,7 @@
 $Id$
 """
 import zope.component
-from zope.app.rdb.interfaces import IZopeDatabaseAdapter
+from zope.rdb.interfaces import IZopeDatabaseAdapter
 
 
 def connectionhandler(_context, name, component, dsn):

Modified: Zope3/branches/jim-adapter/src/zope/rdb/tests/gadflyroot.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/rdb/tests/gadflyroot.zcml	2006-04-11 17:19:39 UTC (rev 66858)
+++ Zope3/branches/jim-adapter/src/zope/rdb/tests/gadflyroot.zcml	2006-04-11 17:32:49 UTC (rev 66859)
@@ -1,7 +1,7 @@
 <configure xmlns="http://namespaces.zope.org/zope"
            xmlns:rdb="http://namespaces.zope.org/rdb">
 
-  <include package="zope.app.rdb" file="gadfly-meta.zcml"/>
+  <include package="zope.rdb" file="gadfly-meta.zcml"/>
   <rdb:gadflyRoot path="./test/dir" />
  
 </configure>

Modified: Zope3/branches/jim-adapter/src/zope/rdb/tests/rdb.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/rdb/tests/rdb.zcml	2006-04-11 17:19:39 UTC (rev 66858)
+++ Zope3/branches/jim-adapter/src/zope/rdb/tests/rdb.zcml	2006-04-11 17:32:49 UTC (rev 66859)
@@ -1,12 +1,12 @@
 <configure xmlns="http://namespaces.zope.org/zope"
            xmlns:rdb="http://namespaces.zope.org/rdb">
 
-  <include package="zope.app.rdb" file="meta.zcml"/>
+  <include package="zope.rdb" file="meta.zcml"/>
 
 
   <rdb:provideConnection
       name="stub"
-      component="zope.app.rdb.tests.test_zopedatabaseadapter.DAStub"
+      component="zope.rdb.tests.test_zopedatabaseadapter.DAStub"
       dsn="dbi://dbname" />
 
 </configure>

Modified: Zope3/branches/jim-adapter/src/zope/rdb/tests/test_directives.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/rdb/tests/test_directives.py	2006-04-11 17:19:39 UTC (rev 66858)
+++ Zope3/branches/jim-adapter/src/zope/rdb/tests/test_directives.py	2006-04-11 17:32:49 UTC (rev 66859)
@@ -19,10 +19,10 @@
 from zope.component.testing import PlacelessSetup
 from zope.component import getUtilitiesFor, queryUtility
 from zope.configuration import xmlconfig
-from zope.app.rdb.interfaces import IZopeDatabaseAdapter
-from zope.app.rdb.tests.test_zopedatabaseadapter import DAStub
-from zope.app.rdb import ZopeConnection
-import zope.app.rdb.tests
+from zope.rdb.interfaces import IZopeDatabaseAdapter
+from zope.rdb.tests.test_zopedatabaseadapter import DAStub
+from zope.rdb import ZopeConnection
+import zope.rdb.tests
 
 class DirectivesTest(PlacelessSetup, unittest.TestCase):
 
@@ -33,7 +33,7 @@
         connectionstub = queryUtility(IZopeDatabaseAdapter, 'stub')
         self.assertEqual(connectionstub, None)
 
-        self.context = xmlconfig.file("rdb.zcml", zope.app.rdb.tests)
+        self.context = xmlconfig.file("rdb.zcml", zope.rdb.tests)
         connectionstub = queryUtility(IZopeDatabaseAdapter, 'stub')
         connection = connectionstub()
         self.assertEqual(connectionstub.__class__, DAStub)

Modified: Zope3/branches/jim-adapter/src/zope/rdb/tests/test_doctests.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/rdb/tests/test_doctests.py	2006-04-11 17:19:39 UTC (rev 66858)
+++ Zope3/branches/jim-adapter/src/zope/rdb/tests/test_doctests.py	2006-04-11 17:32:49 UTC (rev 66859)
@@ -19,7 +19,7 @@
 from zope.testing.doctestunit import DocTestSuite
 
 def test_suite():
-    return DocTestSuite('zope.app.rdb')
+    return DocTestSuite('zope.rdb')
 
 if __name__=='__main__':
     unittest.main(defaultTest='test_suite')

Modified: Zope3/branches/jim-adapter/src/zope/rdb/tests/test_dsnparser.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/rdb/tests/test_dsnparser.py	2006-04-11 17:19:39 UTC (rev 66858)
+++ Zope3/branches/jim-adapter/src/zope/rdb/tests/test_dsnparser.py	2006-04-11 17:32:49 UTC (rev 66859)
@@ -16,7 +16,7 @@
 $Id$
 """
 import unittest
-from zope.app.rdb import parseDSN
+from zope.rdb import parseDSN
 
 
 class TestDSNParser(unittest.TestCase):

Modified: Zope3/branches/jim-adapter/src/zope/rdb/tests/test_gadflyadapter.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/rdb/tests/test_gadflyadapter.py	2006-04-11 17:19:39 UTC (rev 66858)
+++ Zope3/branches/jim-adapter/src/zope/rdb/tests/test_gadflyadapter.py	2006-04-11 17:32:49 UTC (rev 66859)
@@ -21,9 +21,9 @@
 
 from zope.interface.verify import verifyObject
 
-from zope.app.rdb import DatabaseAdapterError
-from zope.app.rdb.interfaces import IZopeConnection, IZopeCursor
-from zope.app.rdb.gadflyda import GadflyAdapter, setGadflyRoot
+from zope.rdb import DatabaseAdapterError
+from zope.rdb.interfaces import IZopeConnection, IZopeCursor
+from zope.rdb.gadflyda import GadflyAdapter, setGadflyRoot
 
 
 class GadflyTestBase(TestCase):

Modified: Zope3/branches/jim-adapter/src/zope/rdb/tests/test_gadflyphantom.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/rdb/tests/test_gadflyphantom.py	2006-04-11 17:19:39 UTC (rev 66858)
+++ Zope3/branches/jim-adapter/src/zope/rdb/tests/test_gadflyphantom.py	2006-04-11 17:32:49 UTC (rev 66859)
@@ -20,7 +20,7 @@
 import tempfile, threading
 from unittest import TestCase, TestSuite, main, makeSuite
 
-from zope.app.rdb.gadflyda import GadflyAdapter, setGadflyRoot
+from zope.rdb.gadflyda import GadflyAdapter, setGadflyRoot
 
 class GadflyTestBase(TestCase):
 

Modified: Zope3/branches/jim-adapter/src/zope/rdb/tests/test_gadflyrootdirective.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/rdb/tests/test_gadflyrootdirective.py	2006-04-11 17:19:39 UTC (rev 66858)
+++ Zope3/branches/jim-adapter/src/zope/rdb/tests/test_gadflyrootdirective.py	2006-04-11 17:32:49 UTC (rev 66859)
@@ -21,17 +21,17 @@
 
 from zope.configuration import xmlconfig
 
-import zope.app.rdb.tests
-from zope.app.rdb.gadflyda import getGadflyRoot
+import zope.rdb.tests
+from zope.rdb.gadflyda import getGadflyRoot
 
 class DirectiveTest(unittest.TestCase):
 
     def test_gadflyRoot(self):
 
         self.assertEqual(getGadflyRoot(), 'gadfly')
-        self.context = xmlconfig.file("gadflyroot.zcml", zope.app.rdb.tests)
+        self.context = xmlconfig.file("gadflyroot.zcml", zope.rdb.tests)
         self.assert_(
-            os.path.join('zope', 'app', 'rdb', 'tests', 'test', 'dir')
+            os.path.join('zope', 'rdb', 'tests', 'test', 'dir')
             in getGadflyRoot()
             )
 

Modified: Zope3/branches/jim-adapter/src/zope/rdb/tests/test_resultset.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/rdb/tests/test_resultset.py	2006-04-11 17:19:39 UTC (rev 66858)
+++ Zope3/branches/jim-adapter/src/zope/rdb/tests/test_resultset.py	2006-04-11 17:32:49 UTC (rev 66859)
@@ -21,7 +21,7 @@
 class TestResultSet(TestCase):
 
     def testPickling(self):
-        from zope.app.rdb import ResultSet
+        from zope.rdb import ResultSet
         from pickle import dumps, loads
 
         columns = ('foo', 'bar')
@@ -35,7 +35,7 @@
         self.assertEqual(rs, unpickled)
 
     def test__cmp__(self):
-        from zope.app.rdb import ResultSet
+        from zope.rdb import ResultSet
         from copy import deepcopy
 
         # See if equal to a copy

Modified: Zope3/branches/jim-adapter/src/zope/rdb/tests/test_row.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/rdb/tests/test_row.py	2006-04-11 17:19:39 UTC (rev 66858)
+++ Zope3/branches/jim-adapter/src/zope/rdb/tests/test_row.py	2006-04-11 17:32:49 UTC (rev 66859)
@@ -21,7 +21,7 @@
 class RowTests(TestCase):
 
     def test_RowClassFactory(self):
-        from zope.app.rdb import RowClassFactory
+        from zope.rdb import RowClassFactory
 
         columns = ('food', 'name')
         data = ('pizza', 'john')
@@ -33,7 +33,7 @@
         self.failUnless(ob.name == 'john', "bad row class attribute (2)")
 
     def test_RowClassFactory_Proxied(self):
-        from zope.app.rdb import RowClassFactory
+        from zope.rdb import RowClassFactory
         from zope.security.proxy import ProxyFactory
         from zope.security.interfaces import ForbiddenAttribute
         from zope.security.interfaces import IChecker
@@ -63,7 +63,7 @@
         self.assert_(IChecker.providedBy(ob.__Security_checker__))
 
     def test__cmp__(self):
-        from zope.app.rdb import RowClassFactory
+        from zope.rdb import RowClassFactory
 
         columns = ('food', 'name')
         data = ('pizza', 'john')
@@ -91,7 +91,7 @@
         self.assert_(ob < ob4, "cmp with different data")
 
     def test_InstanceOnlyDescriptor(self):
-        from zope.app.rdb import InstanceOnlyDescriptor
+        from zope.rdb import InstanceOnlyDescriptor
         inst = object()  # could be anything
         cls = object  # could be any class
         d = InstanceOnlyDescriptor()

Modified: Zope3/branches/jim-adapter/src/zope/rdb/tests/test_zopeconnection.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/rdb/tests/test_zopeconnection.py	2006-04-11 17:19:39 UTC (rev 66858)
+++ Zope3/branches/jim-adapter/src/zope/rdb/tests/test_zopeconnection.py	2006-04-11 17:32:49 UTC (rev 66859)
@@ -17,9 +17,9 @@
 """
 from unittest import TestCase, main, makeSuite
 import transaction
-from zope.app.rdb import ZopeConnection
-from zope.app.rdb.interfaces import IZopeCursor
-from zope.app.rdb.tests.stubs import ConnectionStub, TypeInfoStub
+from zope.rdb import ZopeConnection
+from zope.rdb.interfaces import IZopeCursor
+from zope.rdb.tests.stubs import ConnectionStub, TypeInfoStub
 
 class ZopeConnectionTests(TestCase):
 

Modified: Zope3/branches/jim-adapter/src/zope/rdb/tests/test_zopecursor.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/rdb/tests/test_zopecursor.py	2006-04-11 17:19:39 UTC (rev 66858)
+++ Zope3/branches/jim-adapter/src/zope/rdb/tests/test_zopecursor.py	2006-04-11 17:32:49 UTC (rev 66859)
@@ -16,9 +16,9 @@
 $Id$
 """
 from unittest import TestCase, main, makeSuite
-from zope.app.rdb import ZopeConnection
-from zope.app.rdb import ZopeCursor
-from zope.app.rdb.tests.stubs import *
+from zope.rdb import ZopeConnection
+from zope.rdb import ZopeCursor
+from zope.rdb.tests.stubs import *
 
 
 class MyConnectionStub(ConnectionStub):

Modified: Zope3/branches/jim-adapter/src/zope/rdb/tests/test_zopedatabaseadapter.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/rdb/tests/test_zopedatabaseadapter.py	2006-04-11 17:19:39 UTC (rev 66858)
+++ Zope3/branches/jim-adapter/src/zope/rdb/tests/test_zopedatabaseadapter.py	2006-04-11 17:32:49 UTC (rev 66859)
@@ -16,8 +16,8 @@
 $Id$
 """
 import unittest
-from zope.app.rdb import ZopeDatabaseAdapter
-from zope.app.rdb import ZopeConnection
+from zope.rdb import ZopeDatabaseAdapter
+from zope.rdb import ZopeConnection
 from threading import Thread
 
 class ConnectionStub(object):
@@ -69,7 +69,7 @@
         self.assertEqual(ZopeConnection, conn.__class__)
 
     def testGetConverter(self):
-        from zope.app.rdb import identity
+        from zope.rdb import identity
         da = self._da
         conv = da.getConverter('any')
         self.assert_(conv is identity, "default converter is wrong")

Modified: Zope3/branches/jim-adapter/src/zope/rdb/tests/test_zopedbtransactionmanager.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/rdb/tests/test_zopedbtransactionmanager.py	2006-04-11 17:19:39 UTC (rev 66858)
+++ Zope3/branches/jim-adapter/src/zope/rdb/tests/test_zopedbtransactionmanager.py	2006-04-11 17:32:49 UTC (rev 66859)
@@ -21,9 +21,9 @@
 from transaction.tests.abstestIDataManager import IDataManagerTests
 
 from zope.interface.verify import verifyObject
-from zope.app.rdb import ZopeDBTransactionManager
-from zope.app.rdb import ZopeConnection
-from zope.app.rdb.tests.stubs import ConnectionStub, TypeInfoStub
+from zope.rdb import ZopeDBTransactionManager
+from zope.rdb import ZopeConnection
+from zope.rdb.tests.stubs import ConnectionStub, TypeInfoStub
 
 
 class TxnMgrTest(IDataManagerTests, TestCase):
@@ -85,7 +85,7 @@
 def test_suite():
     from doctest import DocTestSuite
     return TestSuite((
-        DocTestSuite('zope.app.rdb'),
+        DocTestSuite('zope.rdb'),
         makeSuite(TxnMgrTest),
         makeSuite(TwoTxnMgrSortKeyTest),
         ))



More information about the Checkins mailing list