[Checkins] SVN: zope.rdb/trunk/ - use zope.container instead of zope.app.container

[Wolfgang Schnerring]

Log message for revision 95490:
   - use zope.container instead of zope.app.container
   - removed unused dependency on a very old test (transaction.tests.abstestIDataManager)
  

Changed:
  U   zope.rdb/trunk/CHANGES.txt
  U   zope.rdb/trunk/setup.py
  U   zope.rdb/trunk/src/zope/rdb/__init__.py
  U   zope.rdb/trunk/src/zope/rdb/tests/test_zopedbtransactionmanager.py

-=-
Modified: zope.rdb/trunk/CHANGES.txt
===================================================================
--- zope.rdb/trunk/CHANGES.txt	2009-01-29 18:38:14 UTC (rev 95489)
+++ zope.rdb/trunk/CHANGES.txt	2009-01-29 18:39:16 UTC (rev 95490)
@@ -1,10 +1,10 @@
 Change History
 ==============
 
-3.4.3 (Unreleased)
+3.5.0 (Unreleased)
 ------------------
 
-- ...
+- Use zope.container instead of zope.app.container.
 
 3.4.2 (2008/10/10)
 ------------------

Modified: zope.rdb/trunk/setup.py
===================================================================
--- zope.rdb/trunk/setup.py	2009-01-29 18:38:14 UTC (rev 95489)
+++ zope.rdb/trunk/setup.py	2009-01-29 18:39:16 UTC (rev 95490)
@@ -34,7 +34,7 @@
 
 setup(
     name='zope.rdb',
-    version='3.4.3dev',
+    version='3.5.0dev',
     url='http://pypi.python.org/pypi/zope.rdb',
     author='Zope Corporation and Contributors',
     author_email='zope3-dev at zope.org',
@@ -57,14 +57,16 @@
     namespace_packages=['zope',],
     include_package_data=True,
     install_requires=['setuptools',
+                      'transaction',
                       'ZODB3',
+                      'zope.container',
                       'zope.interface',
                       'zope.i18nmessageid',
                       'zope.security',
                       'zope.configuration',
+                      'zope.container',
                       'zope.schema',
                       'zope.thread',
-                      'zope.app.container',
                       ],
     zip_safe=False,
     )

Modified: zope.rdb/trunk/src/zope/rdb/__init__.py
===================================================================
--- zope.rdb/trunk/src/zope/rdb/__init__.py	2009-01-29 18:38:14 UTC (rev 95489)
+++ zope.rdb/trunk/src/zope/rdb/__init__.py	2009-01-29 18:39:16 UTC (rev 95490)
@@ -31,7 +31,7 @@
 from zope.security.checker import NamesChecker
 
 from zope.interface import implements
-from zope.app.container.contained import Contained
+from zope.container.contained import Contained
 from zope.rdb.interfaces import DatabaseException, DatabaseAdapterError
 from zope.rdb.interfaces import IResultSet
 from zope.rdb.interfaces import IZopeConnection, IZopeCursor

Modified: zope.rdb/trunk/src/zope/rdb/tests/test_zopedbtransactionmanager.py
===================================================================
--- zope.rdb/trunk/src/zope/rdb/tests/test_zopedbtransactionmanager.py	2009-01-29 18:38:14 UTC (rev 95489)
+++ zope.rdb/trunk/src/zope/rdb/tests/test_zopedbtransactionmanager.py	2009-01-29 18:39:16 UTC (rev 95490)
@@ -18,7 +18,6 @@
 from unittest import TestCase, main, makeSuite, TestSuite
 import transaction
 from transaction.interfaces import IDataManager
-from transaction.tests.abstestIDataManager import IDataManagerTests
 
 from zope.interface.verify import verifyObject
 from zope.rdb import ZopeDBTransactionManager
@@ -26,7 +25,7 @@
 from zope.rdb.tests.stubs import ConnectionStub, TypeInfoStub
 
 
-class TxnMgrTest(IDataManagerTests, TestCase):
+class TxnMgrTest(TestCase):
 
     def setUp(self):
         self.conn = ConnectionStub()