[Zope3-checkins] CVS: Zope3/src/zodb - conflict.py:1.14 connection.py:1.32 db.py:1.16 export.py:1.8

Martijn Faassen m.faassen@vet.uu.nl
Thu, 1 May 2003 15:35:59 -0400


Update of /cvs-repository/Zope3/src/zodb
In directory cvs.zope.org:/tmp/cvs-serv30407/zodb

Modified Files:
	conflict.py connection.py db.py export.py 
Log Message:
Importgeddon part the second. Removed unused imports throughout the
source tree. This should have taken care of most unused imports
in Zope 3. :)


=== Zope3/src/zodb/conflict.py 1.13 => 1.14 ===
--- Zope3/src/zodb/conflict.py:1.13	Tue Apr  1 15:22:04 2003
+++ Zope3/src/zodb/conflict.py	Thu May  1 15:34:58 2003
@@ -18,7 +18,6 @@
 
 __metaclass__ = type
 
-from cStringIO import StringIO
 from cPickle import PicklingError
 import logging
 


=== Zope3/src/zodb/connection.py 1.31 => 1.32 ===
--- Zope3/src/zodb/connection.py:1.31	Wed Apr 16 18:06:20 2003
+++ Zope3/src/zodb/connection.py	Thu May  1 15:34:58 2003
@@ -41,16 +41,14 @@
 import struct
 import tempfile
 import threading
-from types import ClassType
 
 from zodb import interfaces
 from zodb.conflict import ResolvedSerial
 from zodb.export import ExportImport
 from zodb.interfaces import *
-from zodb.serialize import ConnectionObjectReader, ObjectWriter, findrefs
-from zodb.storage.interfaces import IStorage
+from zodb.serialize import ConnectionObjectReader, ObjectWriter
 from zodb.storage.base import splitrefs
-from zodb.utils import p64, u64, Set
+from zodb.utils import u64, Set
 
 from transaction import get_transaction
 from transaction.interfaces import IDataManager, IRollback, TransactionError


=== Zope3/src/zodb/db.py 1.15 => 1.16 ===
--- Zope3/src/zodb/db.py:1.15	Thu Apr 10 13:27:50 2003
+++ Zope3/src/zodb/db.py	Thu May  1 15:34:58 2003
@@ -20,7 +20,7 @@
 
 import sys
 from threading import Lock
-from time import time, ctime
+from time import time
 import logging
 
 from zodb.storage.interfaces import *


=== Zope3/src/zodb/export.py 1.7 => 1.8 ===
--- Zope3/src/zodb/export.py:1.7	Tue Apr  1 15:22:04 2003
+++ Zope3/src/zodb/export.py	Thu May  1 15:34:58 2003
@@ -18,8 +18,6 @@
 from zodb.serialize import findrefs, ObjectCopier
 from transaction import get_transaction
 
-from cStringIO import StringIO
-from cPickle import Pickler, Unpickler
 from tempfile import TemporaryFile
 
 export_end_marker = '\377' * 16