[Zodb-checkins] SVN: ZODB/branches/tseaver-python_picklecache-2/src/ZODB/ Import TimeStamp from new module holding pure-Python fallback.

[Tres Seaver]

Log message for revision 120403:
  Import TimeStamp from new module holding pure-Python fallback.

Changed:
  U   ZODB/branches/tseaver-python_picklecache-2/src/ZODB/DB.py
  U   ZODB/branches/tseaver-python_picklecache-2/src/ZODB/__init__.py
  U   ZODB/branches/tseaver-python_picklecache-2/src/ZODB/utils.py

-=-
Modified: ZODB/branches/tseaver-python_picklecache-2/src/ZODB/DB.py
===================================================================
--- ZODB/branches/tseaver-python_picklecache-2/src/ZODB/DB.py	2011-02-17 02:32:15 UTC (rev 120402)
+++ ZODB/branches/tseaver-python_picklecache-2/src/ZODB/DB.py	2011-02-17 02:32:17 UTC (rev 120403)
@@ -16,30 +16,24 @@
 
 import cPickle
 import cStringIO
+import datetime
+import logging
 import sys
 import threading
-import logging
-import datetime
-import calendar
 import time
 import warnings
 
-from ZODB.broken import find_global
-from ZODB.utils import z64
-from ZODB.Connection import Connection
-import ZODB.serialize
-
-import transaction.weakset
-
+from persistent.timestamp import TimeStamp
+import transaction
 from zope.interface import implements
+
+from ZODB.Connection import Connection
+from ZODB.broken import find_global
 from ZODB.interfaces import IDatabase
 from ZODB.interfaces import IMVCCStorage
+from ZODB.serialize import referencesf
+from ZODB.utils import z64
 
-import transaction
-
-from persistent.TimeStamp import TimeStamp
-
-
 logger = logging.getLogger('ZODB.DB')
 
 class AbstractConnectionPool(object):
@@ -423,7 +417,7 @@
 
         # Setup storage
         self.storage = storage
-        self.references = ZODB.serialize.referencesf
+        self.references = referencesf
         try:
             storage.registerDB(self)
         except TypeError:

Modified: ZODB/branches/tseaver-python_picklecache-2/src/ZODB/__init__.py
===================================================================
--- ZODB/branches/tseaver-python_picklecache-2/src/ZODB/__init__.py	2011-02-17 02:32:15 UTC (rev 120402)
+++ ZODB/branches/tseaver-python_picklecache-2/src/ZODB/__init__.py	2011-02-17 02:32:17 UTC (rev 120403)
@@ -14,12 +14,12 @@
 
 import sys
 
-from persistent import TimeStamp
+from persistent import timestamp as TimeStamp
 from persistent import list
 from persistent import mapping
 
 # Backward compat for old imports.
-sys.modules['ZODB.TimeStamp'] = sys.modules['persistent.TimeStamp']
+sys.modules['ZODB.TimeStamp'] = sys.modules['persistent.timestamp']
 sys.modules['ZODB.PersistentMapping'] = sys.modules['persistent.mapping']
 sys.modules['ZODB.PersistentList'] = sys.modules['persistent.list']
 

Modified: ZODB/branches/tseaver-python_picklecache-2/src/ZODB/utils.py
===================================================================
--- ZODB/branches/tseaver-python_picklecache-2/src/ZODB/utils.py	2011-02-17 02:32:15 UTC (rev 120402)
+++ ZODB/branches/tseaver-python_picklecache-2/src/ZODB/utils.py	2011-02-17 02:32:17 UTC (rev 120403)
@@ -12,19 +12,20 @@
 #
 ##############################################################################
 
+from binascii import hexlify
+from binascii import unhexlify
+from cStringIO import StringIO
+from struct import pack
+from struct import unpack
+from tempfile import mkstemp
+import cPickle as pickle
+import os
+import struct
 import sys
 import time
-import struct
-from struct import pack, unpack
-from binascii import hexlify, unhexlify
-import cPickle as pickle
-from cStringIO import StringIO
-import weakref
 import warnings
-from tempfile import mkstemp
-import os
 
-from persistent.TimeStamp import TimeStamp
+from persistent.timestamp import TimeStamp
 
 __all__ = ['z64',
            'p64',