[Zodb-checkins] CVS: ZODB3/ZODB - BaseStorage.py:1.34.6.3
Connection.py:1.98.6.13 DB.py:1.53.4.4
DemoStorage.py:1.18.12.4 FileStorage.py:1.135.8.6
MappingStorage.py:1.9.26.2 Mount.py:1.19.22.2
conversionhack.py:1.4.96.1 coptimizations.c:1.23.36.4
fsdump.py:1.7.10.2 fsrecover.py:1.12.8.4 fstools.py:1.1.48.2
utils.py:1.17.6.3
Jim Fulton
cvs-admin at zope.org
Tue Oct 28 16:29:07 EST 2003
Update of /cvs-repository/ZODB3/ZODB
In directory cvs.zope.org:/tmp/cvs-serv9166/ZODB
Modified Files:
Tag: zodb33-devel-branch
BaseStorage.py Connection.py DB.py DemoStorage.py
FileStorage.py MappingStorage.py Mount.py conversionhack.py
coptimizations.c fsdump.py fsrecover.py fstools.py utils.py
Log Message:
Renamed the Persistence package to persistent.
The Persistence package is still there for backward compatability.
=== ZODB3/ZODB/BaseStorage.py 1.34.6.2 => 1.34.6.3 ===
--- ZODB3/ZODB/BaseStorage.py:1.34.6.2 Wed Jul 16 15:35:28 2003
+++ ZODB3/ZODB/BaseStorage.py Tue Oct 28 16:28:31 2003
@@ -21,7 +21,7 @@
import UndoLogCompatible
import POSException
-from Persistence.TimeStamp import TimeStamp
+from persistent.TimeStamp import TimeStamp
z64='\0'*8
class BaseStorage(UndoLogCompatible.UndoLogCompatible):
=== ZODB3/ZODB/Connection.py 1.98.6.12 => 1.98.6.13 ===
--- ZODB3/ZODB/Connection.py:1.98.6.12 Wed Jul 16 15:11:02 2003
+++ ZODB3/ZODB/Connection.py Tue Oct 28 16:28:32 2003
@@ -21,7 +21,7 @@
import threading
from time import time
-from Persistence import PickleCache
+from persistent import PickleCache
from zLOG import LOG, ERROR, BLATHER, WARNING
from ZODB.ConflictResolution import ResolvedSerial
=== ZODB3/ZODB/DB.py 1.53.4.3 => 1.53.4.4 ===
--- ZODB3/ZODB/DB.py:1.53.4.3 Mon Jul 7 14:11:21 2003
+++ ZODB3/ZODB/DB.py Tue Oct 28 16:28:32 2003
@@ -84,7 +84,7 @@
storage.load('\0\0\0\0\0\0\0\0','')
except KeyError:
# Create the database's root in the storage if it doesn't exist
- from Persistence.PersistentMapping import PersistentMapping
+ from persistent.mapping import PersistentMapping
root = PersistentMapping()
# Manually create a pickle for the root to put in the storage.
# The pickle must be in the special ZODB format.
=== ZODB3/ZODB/DemoStorage.py 1.18.12.3 => 1.18.12.4 ===
--- ZODB3/ZODB/DemoStorage.py:1.18.12.3 Thu Jul 10 13:45:52 2003
+++ ZODB3/ZODB/DemoStorage.py Tue Oct 28 16:28:32 2003
@@ -83,7 +83,7 @@
import base64, time, string
from ZODB import POSException, BaseStorage, utils
-from Persistence.TimeStamp import TimeStamp
+from persistent.TimeStamp import TimeStamp
from cPickle import loads
from BTrees import OOBTree
=== ZODB3/ZODB/FileStorage.py 1.135.8.5 => 1.135.8.6 ===
--- ZODB3/ZODB/FileStorage.py:1.135.8.5 Tue Jul 15 14:02:57 2003
+++ ZODB3/ZODB/FileStorage.py Tue Oct 28 16:28:32 2003
@@ -130,7 +130,7 @@
# Not all platforms have fsync
fsync = getattr(os, "fsync", None)
-from Persistence.TimeStamp import TimeStamp
+from persistent.TimeStamp import TimeStamp
from ZODB import BaseStorage, ConflictResolution, POSException
from ZODB.POSException import UndoError, POSKeyError, MultipleUndoErrors
from ZODB.lock_file import LockFile
=== ZODB3/ZODB/MappingStorage.py 1.9.26.1 => 1.9.26.2 ===
--- ZODB3/ZODB/MappingStorage.py:1.9.26.1 Tue Jul 1 15:34:10 2003
+++ ZODB3/ZODB/MappingStorage.py Tue Oct 28 16:28:32 2003
@@ -26,7 +26,7 @@
from ZODB import utils
from ZODB import BaseStorage
from ZODB import POSException
-from Persistence.TimeStamp import TimeStamp
+from persistent.TimeStamp import TimeStamp
class MappingStorage(BaseStorage.BaseStorage):
=== ZODB3/ZODB/Mount.py 1.19.22.1 => 1.19.22.2 ===
--- ZODB3/ZODB/Mount.py:1.19.22.1 Tue Jul 1 15:34:10 2003
+++ ZODB3/ZODB/Mount.py Tue Oct 28 16:28:32 2003
@@ -16,7 +16,7 @@
$Id$"""
__version__='$Revision$'[11:-2]
-import thread, Persistence, Acquisition
+import thread, persistent, Acquisition
from Acquisition import aq_base
import string, time, sys
from POSException import MountedStorageError
@@ -44,7 +44,7 @@
return parent_db._classFactory(parent_conn, module, name)
-class MountPoint(Persistence.Persistent, Acquisition.Implicit):
+class MountPoint(persistent.Persistent, Acquisition.Implicit):
'''The base class for a Zope object which, when traversed,
accesses a different database.
'''
=== ZODB3/ZODB/conversionhack.py 1.4 => 1.4.96.1 ===
--- ZODB3/ZODB/conversionhack.py:1.4 Wed Aug 14 18:07:09 2002
+++ ZODB3/ZODB/conversionhack.py Tue Oct 28 16:28:32 2003
@@ -12,7 +12,7 @@
#
##############################################################################
-import PersistentMapping
+import persistent.mapping
class fixer:
def __of__(self, parent):
@@ -27,7 +27,7 @@
hack=hack()
def __basicnew__():
- r=PersistentMapping.PersistentMapping()
+ r=persistent.mapping.PersistentMapping()
r.__setstate__=fixer
return r
=== ZODB3/ZODB/coptimizations.c 1.23.36.3 => 1.23.36.4 ===
--- ZODB3/ZODB/coptimizations.c:1.23.36.3 Tue Jul 1 18:55:53 2003
+++ ZODB3/ZODB/coptimizations.c Tue Oct 28 16:28:32 2003
@@ -298,7 +298,7 @@
if (!InvalidObjectReference)
return;
- cPersistenceCAPI = PyCObject_Import("Persistence.cPersistence", "CAPI");
+ cPersistenceCAPI = PyCObject_Import("persistent.cPersistence", "CAPI");
if (!cPersistenceCAPI)
return;
=== ZODB3/ZODB/fsdump.py 1.7.10.1 => 1.7.10.2 ===
--- ZODB3/ZODB/fsdump.py:1.7.10.1 Tue Jul 1 15:34:10 2003
+++ ZODB3/ZODB/fsdump.py Tue Oct 28 16:28:32 2003
@@ -1,7 +1,7 @@
from ZODB.FileStorage import FileIterator
from ZODB.utils import u64
from ZODB.tests.StorageTestBase import zodb_unpickle
-from Persistence.TimeStamp import TimeStamp
+from persistent.TimeStamp import TimeStamp
from cPickle import Unpickler
from cStringIO import StringIO
=== ZODB3/ZODB/fsrecover.py 1.12.8.3 => 1.12.8.4 ===
--- ZODB3/ZODB/fsrecover.py:1.12.8.3 Tue Jul 15 14:02:57 2003
+++ ZODB3/ZODB/fsrecover.py Tue Oct 28 16:28:32 2003
@@ -83,7 +83,7 @@
import getopt, ZODB.FileStorage, struct, time
from struct import unpack
from ZODB.utils import t32, p64, u64
-from Persistence.TimeStamp import TimeStamp
+from persistent.TimeStamp import TimeStamp
from cPickle import loads
from ZODB.FileStorage import RecordIterator
=== ZODB3/ZODB/fstools.py 1.1.48.1 => 1.1.48.2 ===
--- ZODB3/ZODB/fstools.py:1.1.48.1 Tue Jul 1 15:34:10 2003
+++ ZODB3/ZODB/fstools.py Tue Oct 28 16:28:32 2003
@@ -24,7 +24,7 @@
from ZODB.FileStorage import TRANS_HDR, DATA_HDR, TRANS_HDR_LEN, \
DATA_HDR_LEN, DATA_VERSION_HDR_LEN
from ZODB.utils import p64, u64
-from Persistence.TimeStamp import TimeStamp
+from persistent.TimeStamp import TimeStamp
class TxnHeader:
"""Object representing a transaction record header.
=== ZODB3/ZODB/utils.py 1.17.6.2 => 1.17.6.3 ===
--- ZODB3/ZODB/utils.py:1.17.6.2 Tue Jul 1 16:57:18 2003
+++ ZODB3/ZODB/utils.py Tue Oct 28 16:28:32 2003
@@ -14,7 +14,7 @@
import sys
import time
-from Persistence.TimeStamp import TimeStamp
+from persistent.TimeStamp import TimeStamp
from struct import pack, unpack
from types import StringType
More information about the Zodb-checkins
mailing list