[Zodb-checkins] CVS: ZODB3/ZODB - Connection.py:1.98.6.9

[Jeremy Hylton]

Update of /cvs-repository/ZODB3/ZODB
In directory cvs.zope.org:/tmp/cvs-serv21639

Modified Files:
      Tag: zodb33-devel-branch
	Connection.py 
Log Message:
Reorganize imports and make them all absolute imports.


=== ZODB3/ZODB/Connection.py 1.98.6.8 => 1.98.6.9 ===
--- ZODB3/ZODB/Connection.py:1.98.6.8	Thu Jul 10 09:46:09 2003
+++ ZODB3/ZODB/Connection.py	Thu Jul 10 09:49:29 2003
@@ -15,21 +15,23 @@
 
 $Id$"""
 
-from Persistence.cPickleCache import PickleCache
-from POSException import ConflictError, ReadConflictError, TransactionError
-import ExportImport, TmpStore
-from zLOG import LOG, ERROR, BLATHER, WARNING
-from coptimizations import new_persistent_id
-from ConflictResolution import ResolvedSerial
-from Transaction import Transaction, get_transaction
-from ZODB.utils import oid_repr
-
 from cPickle import Unpickler, Pickler
 from cStringIO import StringIO
 import sys
 import threading
 from time import time
-from types import StringType, ClassType
+
+from Persistence import PickleCache
+from zLOG import LOG, ERROR, BLATHER, WARNING
+
+from ZODB.ConflictResolution import ResolvedSerial
+from ZODB.coptimizations import new_persistent_id
+from ZODB.ExportImport import ExportImport
+from ZODB.POSException \
+     import ConflictError, ReadConflictError, TransactionError
+from ZODB.TmpStore import TmpStore
+from ZODB.Transaction import Transaction, get_transaction
+from ZODB.utils import oid_repr
 
 global_code_timestamp = 0
 
@@ -42,7 +44,7 @@
     global global_code_timestamp
     global_code_timestamp = time()
 
-class Connection(ExportImport.ExportImport, object):
+class Connection(ExportImport, object):
     """Object managers for individual object space.
 
     An object space is a version of collection of objects.  In a
@@ -661,7 +663,7 @@
         if sub:
             # Sub-transaction!
             if self._tmp is None:
-                _tmp = TmpStore.TmpStore(self._version)
+                _tmp = TmpStore(self._version)
                 self._tmp = self._storage
                 self._storage = _tmp
                 _tmp.registerDB(self._db, 0)
@@ -700,7 +702,7 @@
 
         if not store_return:
             return
-        if isinstance(store_return, StringType):
+        if isinstance(store_return, str):
             assert oid is not None
             self._handle_one_serial(oid, store_return, change)
         else:
@@ -708,7 +710,7 @@
                 self._handle_one_serial(oid, serial, change)
 
     def _handle_one_serial(self, oid, serial, change):
-        if not isinstance(serial, StringType):
+        if not isinstance(serial, str):
             raise serial
         obj = self._cache.get(oid, None)
         if obj is None: