[Zodb-checkins] CVS: ZODB/src/ZODB - BaseStorage.py:1.44 Connection.py:1.127 DB.py:1.64 Mount.py:1.22 POSException.py:1.23 Transaction.py:1.58 dbmStorage.py:1.5 fspack.py:1.16 fsrecover.py:1.16 fstools.py:1.4

[Martijn Faassen]

Update of /cvs-repository/ZODB/src/ZODB
In directory cvs.zope.org:/tmp/cvs-serv1093/src/ZODB

Modified Files:
	BaseStorage.py Connection.py DB.py Mount.py POSException.py 
	Transaction.py dbmStorage.py fspack.py fsrecover.py fstools.py 
Log Message:
Remove unused imports.


=== ZODB/src/ZODB/BaseStorage.py 1.43 => 1.44 ===
--- ZODB/src/ZODB/BaseStorage.py:1.43	Thu Feb 26 17:53:23 2004
+++ ZODB/src/ZODB/BaseStorage.py	Thu Feb 26 19:31:53 2004
@@ -26,7 +26,6 @@
 import zLOG
 from ZODB import POSException
 from ZODB.UndoLogCompatible import UndoLogCompatible
-from ZODB.utils import z64
 
 class BaseStorage(UndoLogCompatible):
     _transaction=None # Transaction that is being committed


=== ZODB/src/ZODB/Connection.py 1.126 => 1.127 ===
--- ZODB/src/ZODB/Connection.py:1.126	Thu Feb 26 17:57:09 2004
+++ ZODB/src/ZODB/Connection.py	Thu Feb 26 19:31:53 2004
@@ -24,7 +24,6 @@
 from utils import u64
 
 from persistent import PickleCache
-from zLOG import LOG, ERROR, BLATHER, WARNING
 
 from ZODB.ConflictResolution import ResolvedSerial
 from ZODB.ExportImport import ExportImport


=== ZODB/src/ZODB/DB.py 1.63 => 1.64 ===
--- ZODB/src/ZODB/DB.py:1.63	Wed Feb 25 07:31:56 2004
+++ ZODB/src/ZODB/DB.py	Thu Feb 26 19:31:53 2004
@@ -16,7 +16,7 @@
 $Id$"""
 __version__='$Revision$'[11:-2]
 
-import cPickle, cStringIO, sys, POSException, UndoLogCompatible
+import cPickle, cStringIO, sys, UndoLogCompatible
 from Connection import Connection
 from thread import allocate_lock
 from Transaction import Transaction, get_transaction
@@ -24,8 +24,6 @@
 from time import time, ctime
 from zLOG import LOG, ERROR
 from ZODB.broken import find_global
-
-from types import StringType
 
 def list2dict(L):
     d = {}


=== ZODB/src/ZODB/Mount.py 1.21 => 1.22 ===
--- ZODB/src/ZODB/Mount.py:1.21	Fri Nov 28 11:44:49 2003
+++ ZODB/src/ZODB/Mount.py	Thu Feb 26 19:31:53 2004
@@ -20,7 +20,7 @@
 from Acquisition import aq_base
 import string, time, sys
 from POSException import MountedStorageError
-from zLOG import LOG, ERROR, INFO, WARNING
+from zLOG import LOG, INFO, WARNING
 
 # dbs is a holder for all DB objects, needed to overcome
 # threading issues.  It maps connection params to a DB object


=== ZODB/src/ZODB/POSException.py 1.22 => 1.23 ===
--- ZODB/src/ZODB/POSException.py:1.22	Fri Nov 28 11:44:49 2003
+++ ZODB/src/ZODB/POSException.py	Thu Feb 26 19:31:53 2004
@@ -15,7 +15,6 @@
 
 $Id$"""
 
-from types import StringType, DictType
 from ZODB.utils import oid_repr, serial_repr
 
 def _fmt_undo(oid, reason):


=== ZODB/src/ZODB/Transaction.py 1.57 => 1.58 ===
--- ZODB/src/ZODB/Transaction.py:1.57	Wed Feb 18 21:59:06 2004
+++ ZODB/src/ZODB/Transaction.py	Thu Feb 26 19:31:53 2004
@@ -19,7 +19,7 @@
 from thread import get_ident as _get_ident
 
 from zLOG import LOG, ERROR, PANIC, INFO, BLATHER, WARNING
-from ZODB.POSException import ConflictError, TransactionError
+from ZODB.POSException import TransactionError
 from ZODB.utils import oid_repr
 
 # Flag indicating whether certain errors have occurred.


=== ZODB/src/ZODB/dbmStorage.py 1.4 => 1.5 ===
--- ZODB/src/ZODB/dbmStorage.py:1.4	Wed Aug 14 18:07:09 2002
+++ ZODB/src/ZODB/dbmStorage.py	Thu Feb 26 19:31:53 2004
@@ -20,8 +20,6 @@
 """
 __version__='$Revision$'[11:-2]
 
-import base64, POSException, time, string, utils
-
 from MappingStorage import MappingStorage
 from BaseStorage import BaseStorage
 import anydbm, os


=== ZODB/src/ZODB/fspack.py 1.15 => 1.16 ===
--- ZODB/src/ZODB/fspack.py:1.15	Thu Feb 19 13:35:24 2004
+++ ZODB/src/ZODB/fspack.py	Thu Feb 26 19:31:53 2004
@@ -34,7 +34,7 @@
 
 from ZODB.serialize import referencesf
 from ZODB.utils import p64, u64, z64, oid_repr
-from zLOG import LOG, BLATHER, WARNING, ERROR, PANIC
+from zLOG import LOG, ERROR
 
 try:
     from ZODB.fsIndex import fsIndex


=== ZODB/src/ZODB/fsrecover.py 1.15 => 1.16 ===
--- ZODB/src/ZODB/fsrecover.py:1.15	Thu Feb 19 13:35:24 2004
+++ ZODB/src/ZODB/fsrecover.py	Thu Feb 26 19:31:53 2004
@@ -80,9 +80,9 @@
     import ZODB
 
 
-import getopt, ZODB.FileStorage, struct, time
+import getopt, ZODB.FileStorage, time
 from struct import unpack
-from ZODB.utils import t32, p64, u64
+from ZODB.utils import t32, u64
 from persistent.TimeStamp import TimeStamp
 from cPickle import loads
 from ZODB.FileStorage import RecordIterator


=== ZODB/src/ZODB/fstools.py 1.3 => 1.4 ===
--- ZODB/src/ZODB/fstools.py:1.3	Wed Feb 25 15:40:54 2004
+++ ZODB/src/ZODB/fstools.py	Thu Feb 26 19:31:53 2004
@@ -23,7 +23,7 @@
 
 from ZODB.FileStorage.format import TRANS_HDR, DATA_HDR, TRANS_HDR_LEN, \
      DATA_HDR_LEN, DATA_VERSION_HDR_LEN
-from ZODB.utils import p64, u64
+from ZODB.utils import u64
 from persistent.TimeStamp import TimeStamp
 
 class TxnHeader: