[Zope-Checkins] CVS: Zope3/lib/python/ZODB - Connection.py:1.60.6.6

[Jeremy Hylton]

Update of /cvs-repository/Zope3/lib/python/ZODB
In directory cvs.zope.org:/tmp/cvs-serv20611

Modified Files:
      Tag: Zope-3x-branch
	Connection.py 
Log Message:
Reorganize imports:
    imports from this package, followed by
    imports from Zope3, followed by
    imports from std libraries

Remove unused definition of ExtensionKlass.

   


=== Zope3/lib/python/ZODB/Connection.py 1.60.6.5 => 1.60.6.6 ===
 __version__='$Revision$'[11:-2]
 
+from ZODB import ExportImport, TmpStore
+from ZODB.ConflictResolution import ResolvedSerial
+from ZODB.POSException import ConflictError
+from ZODB.utils import U64
+
 from Persistence.Cache import Cache
-from POSException import ConflictError
-import ExportImport, TmpStore
+from Transaction import get_transaction
 from zLOG import LOG, ERROR, BLATHER
-from ConflictResolution import ResolvedSerial
-from ZODB.utils import U64
 
 from cPickle import Unpickler, Pickler
 from cStringIO import StringIO
@@ -26,8 +28,6 @@
 from time import time
 from types import StringType, ClassType, TupleType
 
-from Transaction import get_transaction
-
 global_code_timestamp = 0
 
 def updateCodeTimestamp():
@@ -38,8 +38,6 @@
     '''
     global global_code_timestamp
     global_code_timestamp = time()
-
-ExtensionKlass=object.__class__
 
 class Connection(ExportImport.ExportImport):
     """Object managers for individual object space.