[Zope-CVS] CVS: Products3/psycopgda/tests - test_adapter.py:1.5

[Sidnei da Silva]

Update of /cvs-repository/Products3/psycopgda/tests
In directory cvs.zope.org:/tmp/cvs-serv18188/tests

Modified Files:
	test_adapter.py 
Log Message:
Update to work with (at least) Zope X3.0


=== Products3/psycopgda/tests/test_adapter.py 1.4 => 1.5 ===
--- Products3/psycopgda/tests/test_adapter.py:1.4	Mon Feb  9 01:04:28 2004
+++ Products3/psycopgda/tests/test_adapter.py	Tue Jul  6 15:47:18 2004
@@ -17,8 +17,8 @@
 """
 
 from unittest import TestCase, TestSuite, main, makeSuite
-import psycopg
 from datetime import tzinfo, timedelta
+import psycopg
 
 class Stub:
 
@@ -72,13 +72,13 @@
 class TestPsycopgTypeConversion(TestCase):
 
     def test_conv_date(self):
-        from zopeproducts.psycopgda.adapter import _conv_date
+        from psycopgda.adapter import _conv_date
         from datetime import date
         self.assertEquals(_conv_date(''), None)
         self.assertEquals(_conv_date('2001-03-02'), date(2001, 3, 2))
 
     def test_conv_time(self):
-        from zopeproducts.psycopgda.adapter import _conv_time
+        from psycopgda.adapter import _conv_time
         from datetime import time
         self.assertEquals(_conv_time(''), None)
         self.assertEquals(_conv_time('23:17:57'),
@@ -87,7 +87,7 @@
                           time(23, 17, 57, 37000))
 
     def test_conv_timetz(self):
-        from zopeproducts.psycopgda.adapter import _conv_timetz
+        from psycopgda.adapter import _conv_timetz
         from datetime import time
         self.assertEquals(_conv_timetz(''), None)
         self.assertEquals(_conv_timetz('12:44:01+01:00'),
@@ -96,7 +96,7 @@
                           time(12, 44, 01, 37000, TZStub(0,-30)))
 
     def test_conv_timestamp(self):
-        from zopeproducts.psycopgda.adapter import _conv_timestamp
+        from psycopgda.adapter import _conv_timestamp
         from datetime import datetime
         self.assertEquals(_conv_timestamp(''), None)
         self.assertEquals(_conv_timestamp('2001-03-02 12:44:01'),
@@ -107,7 +107,7 @@
                           datetime(2001, 3, 2, 12, 44, 01, 1))
 
     def test_conv_timestamptz(self):
-        from zopeproducts.psycopgda.adapter import _conv_timestamptz as c
+        from psycopgda.adapter import _conv_timestamptz as c
         from datetime import datetime
         self.assertEquals(c(''), None)
 
@@ -121,7 +121,7 @@
                   datetime(2001, 6, 25, 12, 14, 00, 0, TZStub(-7,0)))
 
     def test_conv_interval(self):
-        from zopeproducts.psycopgda.adapter import _conv_interval as c
+        from psycopgda.adapter import _conv_interval as c
         from datetime import timedelta
         self.assertEquals(c(''), None)
         self.assertEquals(c('01:00'), timedelta(hours=1))
@@ -155,16 +155,16 @@
 class TestPsycopgAdapter(TestCase):
 
     def setUp(self):
-        import zopeproducts.psycopgda.adapter as adapter
+        import psycopgda.adapter as adapter
         self.real_psycopg = adapter.psycopg
         adapter.psycopg = self.psycopg_stub = PsycopgStub()
 
     def tearDown(self):
-        import zopeproducts.psycopgda.adapter as adapter
+        import psycopgda.adapter as adapter
         adapter.psycopg = self.real_psycopg
 
     def test_connection_factory(self):
-        from zopeproducts.psycopgda.adapter import PsycopgAdapter
+        from psycopgda.adapter import PsycopgAdapter
         a = PsycopgAdapter('dbi://username:password@hostname:port/dbname;junk=ignored')
         c = a._connection_factory()
         args = self.psycopg_stub.last_connection_string.split()
@@ -174,8 +174,8 @@
                                  'user=username'])
 
     def test_registerTypes(self):
-        import zopeproducts.psycopgda.adapter as adapter
-        from zopeproducts.psycopgda.adapter import PsycopgAdapter
+        import psycopgda.adapter as adapter
+        from psycopgda.adapter import PsycopgAdapter
         a = PsycopgAdapter('dbi://')
         a._registerTypes()
         for typename in ('DATE', 'TIME', 'TIMETZ', 'TIMESTAMP',
@@ -259,7 +259,7 @@
     # tzoffset is offset in minutes east of UTC
 
     def setUp(self):
-        from zopeproducts.psycopgda.adapter import parse_date, parse_time, \
+        from psycopgda.adapter import parse_date, parse_time, \
                                 parse_timetz, parse_datetime, parse_datetimetz
         self.parse_date = parse_date
         self.parse_time = parse_time