[Checkins] SVN: cxoracleda/trunk/src/cxoracleda/ zope 3.3 compat

[Bernd Dorn]

Log message for revision 70601:
  zope 3.3 compat

Changed:
  U   cxoracleda/trunk/src/cxoracleda/adapter.py
  U   cxoracleda/trunk/src/cxoracleda/configure.zcml
  U   cxoracleda/trunk/src/cxoracleda/tests/test_adapter.py

-=-
Modified: cxoracleda/trunk/src/cxoracleda/adapter.py
===================================================================
--- cxoracleda/trunk/src/cxoracleda/adapter.py	2006-10-11 07:29:24 UTC (rev 70600)
+++ cxoracleda/trunk/src/cxoracleda/adapter.py	2006-10-11 07:35:16 UTC (rev 70601)
@@ -1,7 +1,7 @@
 """cx_Oracle database adapter.
 """
 import cx_Oracle            
-from zope.app.rdb import ZopeDatabaseAdapter, parseDSN
+from zope.rdb import ZopeDatabaseAdapter, parseDSN
 from datetime import datetime
 
 class UnicodeConverter(object):

Modified: cxoracleda/trunk/src/cxoracleda/configure.zcml
===================================================================
--- cxoracleda/trunk/src/cxoracleda/configure.zcml	2006-10-11 07:29:24 UTC (rev 70600)
+++ cxoracleda/trunk/src/cxoracleda/configure.zcml	2006-10-11 07:35:16 UTC (rev 70601)
@@ -3,21 +3,21 @@
     xmlns:browser="http://namespaces.zope.org/browser"
     i18n_domain="cxoracleda">
 
-  <content class=".adapter.DatabaseAdapter">
+  <class class=".adapter.DatabaseAdapter">
     <factory id="zope.da.cxOracleDA" />
     <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"
         />
-  </content>
+  </class>
   
   <browser:addform
       name="AddcxOracleDA"
-      schema="zope.app.rdb.interfaces.IManageableZopeDatabaseAdapter"
+      schema="zope.rdb.interfaces.IManageableZopeDatabaseAdapter"
       label="Add cx_Oracle Database Adapter"
       content_factory=".adapter.DatabaseAdapter"
       arguments="dsn"

Modified: cxoracleda/trunk/src/cxoracleda/tests/test_adapter.py
===================================================================
--- cxoracleda/trunk/src/cxoracleda/tests/test_adapter.py	2006-10-11 07:29:24 UTC (rev 70600)
+++ cxoracleda/trunk/src/cxoracleda/tests/test_adapter.py	2006-10-11 07:35:16 UTC (rev 70601)
@@ -3,20 +3,18 @@
 from unittest import TestCase, TestSuite, main, makeSuite
 from cxoracleda.adapter import DatabaseAdapter
 from zope.app import zapi
-from zope.app.rdb.interfaces import IManageableZopeDatabaseAdapter,IZopeDatabaseAdapter
+from zope.rdb.interfaces import (IManageableZopeDatabaseAdapter,
+                                 IZopeDatabaseAdapter)
 from zope.app.testing import setup
 import os
-propFile = os.path.join(os.environ.get('HOME'),"etc/zope/cxoracleda/testproperties.py")
+propFile = os.path.join(os.environ.get('HOME'),
+                        "etc/zope/cxoracleda/testproperties.py")
 
 try:
     execfile(propFile)
 except:
     raise "Local property file not found",propFile
 
-
-
-
-
 class TestBase(TestCase):
     
     def setUp(self):
@@ -29,7 +27,8 @@
         sm = root.getSiteManager()
         setup.addUtility(sm, 'test_db_adapter',
                          IManageableZopeDatabaseAdapter, self.da)
-        da, = list(zapi.getAllUtilitiesRegisteredFor(IManageableZopeDatabaseAdapter))
+        da, = list(zapi.getAllUtilitiesRegisteredFor(
+            IManageableZopeDatabaseAdapter))
         self.assertEqual(da,self.da)
 
     def test_it(self):
@@ -75,11 +74,6 @@
         cursor.close()
         da.disconnect()
 
-
-
-
-
-
 def test_suite():
     return TestSuite((
             makeSuite(TestBase),