Prepare to stitch in current ZODB.

f92750da · Tim Peters · aff79779 · aff79779 · aff79779 · aff79779
Commit f92750da authored Oct 05, 2004 by Tim Peters
261 changed files
--- a/lib/python/BTrees/BTreeItemsTemplate.c
+++ b/lib/python/BTrees/BTreeItemsTemplate.c
--- a/lib/python/BTrees/BTreeModuleTemplate.c
+++ b/lib/python/BTrees/BTreeModuleTemplate.c
--- a/lib/python/BTrees/BTreeTemplate.c
+++ b/lib/python/BTrees/BTreeTemplate.c
--- a/lib/python/BTrees/BucketTemplate.c
+++ b/lib/python/BTrees/BucketTemplate.c
--- a/lib/python/BTrees/DEPENDENCIES.cfg
+++ b/lib/python/BTrees/DEPENDENCIES.cfg
-persistent
-transaction
--- a/lib/python/BTrees/IIBTree.py
+++ b/lib/python/BTrees/IIBTree.py
--- a/lib/python/BTrees/IOBTree.py
+++ b/lib/python/BTrees/IOBTree.py
--- a/lib/python/BTrees/Interfaces.py
+++ b/lib/python/BTrees/Interfaces.py
--- a/lib/python/BTrees/Length.py
+++ b/lib/python/BTrees/Length.py
--- a/lib/python/BTrees/Maintainer.txt
+++ b/lib/python/BTrees/Maintainer.txt
--- a/lib/python/BTrees/MergeTemplate.c
+++ b/lib/python/BTrees/MergeTemplate.c
--- a/lib/python/BTrees/OIBTree.py
+++ b/lib/python/BTrees/OIBTree.py
--- a/lib/python/BTrees/OOBTree.py
+++ b/lib/python/BTrees/OOBTree.py
--- a/lib/python/BTrees/SETUP.cfg
+++ b/lib/python/BTrees/SETUP.cfg
--- a/lib/python/BTrees/SetOpTemplate.c
+++ b/lib/python/BTrees/SetOpTemplate.c
--- a/lib/python/BTrees/SetTemplate.c
+++ b/lib/python/BTrees/SetTemplate.c
--- a/lib/python/BTrees/TreeSetTemplate.c
+++ b/lib/python/BTrees/TreeSetTemplate.c
--- a/lib/python/BTrees/_IIBTree.c
+++ b/lib/python/BTrees/_IIBTree.c
--- a/lib/python/BTrees/_IOBTree.c
+++ b/lib/python/BTrees/_IOBTree.c
--- a/lib/python/BTrees/_OIBTree.c
+++ b/lib/python/BTrees/_OIBTree.c
--- a/lib/python/BTrees/_OOBTree.c
+++ b/lib/python/BTrees/_OOBTree.c
--- a/lib/python/BTrees/__init__.py
+++ b/lib/python/BTrees/__init__.py
-# This is a Python package.
--- a/lib/python/BTrees/_fsBTree.c
+++ b/lib/python/BTrees/_fsBTree.c
--- a/lib/python/BTrees/check.py
+++ b/lib/python/BTrees/check.py
--- a/lib/python/BTrees/convert.py
+++ b/lib/python/BTrees/convert.py
--- a/lib/python/BTrees/intkeymacros.h
+++ b/lib/python/BTrees/intkeymacros.h
--- a/lib/python/BTrees/intvaluemacros.h
+++ b/lib/python/BTrees/intvaluemacros.h
--- a/lib/python/BTrees/objectkeymacros.h
+++ b/lib/python/BTrees/objectkeymacros.h
--- a/lib/python/BTrees/objectvaluemacros.h
+++ b/lib/python/BTrees/objectvaluemacros.h
--- a/lib/python/BTrees/sorters.c
+++ b/lib/python/BTrees/sorters.c
--- a/lib/python/BTrees/tests/__init__.py
+++ b/lib/python/BTrees/tests/__init__.py
-# If tests is a package, debugging is a bit easier.
--- a/lib/python/BTrees/tests/testBTrees.py
+++ b/lib/python/BTrees/tests/testBTrees.py
--- a/lib/python/BTrees/tests/testBTreesUnicode.py
+++ b/lib/python/BTrees/tests/testBTreesUnicode.py
--- a/lib/python/BTrees/tests/testConflict.py
+++ b/lib/python/BTrees/tests/testConflict.py
--- a/lib/python/BTrees/tests/testSetOps.py
+++ b/lib/python/BTrees/tests/testSetOps.py
--- a/lib/python/BTrees/tests/test_btreesubclass.py
+++ b/lib/python/BTrees/tests/test_btreesubclass.py
--- a/lib/python/BTrees/tests/test_check.py
+++ b/lib/python/BTrees/tests/test_check.py
--- a/lib/python/BTrees/tests/test_compare.py
+++ b/lib/python/BTrees/tests/test_compare.py
--- a/lib/python/Persistence/DEPENDENCIES.cfg
+++ b/lib/python/Persistence/DEPENDENCIES.cfg
-ZODB
-persistent
--- a/lib/python/Persistence/_Persistence.c
+++ b/lib/python/Persistence/_Persistence.c
--- a/lib/python/Persistence/__init__.py
+++ b/lib/python/Persistence/__init__.py
--- a/lib/python/Persistence/mapping.py
+++ b/lib/python/Persistence/mapping.py
--- a/lib/python/Persistence/tests/__init__.py
+++ b/lib/python/Persistence/tests/__init__.py
-# package
--- a/lib/python/Persistence/tests/testPersistent.py
+++ b/lib/python/Persistence/tests/testPersistent.py
--- a/lib/python/Persistence/tests/test_ExtensionClass.py
+++ b/lib/python/Persistence/tests/test_ExtensionClass.py
--- a/lib/python/Persistence/tests/test_mapping.py
+++ b/lib/python/Persistence/tests/test_mapping.py
--- a/lib/python/ThreadedAsync/LoopCallback.py
+++ b/lib/python/ThreadedAsync/LoopCallback.py
--- a/lib/python/ThreadedAsync/__init__.py
+++ b/lib/python/ThreadedAsync/__init__.py
--- a/lib/python/ZEO/ClientStorage.py
+++ b/lib/python/ZEO/ClientStorage.py
--- a/lib/python/ZEO/ClientStub.py
+++ b/lib/python/ZEO/ClientStub.py
--- a/lib/python/ZEO/CommitLog.py
+++ b/lib/python/ZEO/CommitLog.py
--- a/lib/python/ZEO/DEPENDENCIES.cfg
+++ b/lib/python/ZEO/DEPENDENCIES.cfg
--- a/lib/python/ZEO/DebugServer.py
+++ b/lib/python/ZEO/DebugServer.py
--- a/lib/python/ZEO/Exceptions.py
+++ b/lib/python/ZEO/Exceptions.py
--- a/lib/python/ZEO/README.txt
+++ b/lib/python/ZEO/README.txt
--- a/lib/python/ZEO/SETUP.cfg
+++ b/lib/python/ZEO/SETUP.cfg
-script  runzeo.py
-script  zeoctl.py
-script  zeopasswd.py
-script  mkzeoinst.py
--- a/lib/python/ZEO/ServerStub.py
+++ b/lib/python/ZEO/ServerStub.py
--- a/lib/python/ZEO/StorageServer.py
+++ b/lib/python/ZEO/StorageServer.py
--- a/lib/python/ZEO/TransactionBuffer.py
+++ b/lib/python/ZEO/TransactionBuffer.py
--- a/lib/python/ZEO/__init__.py
+++ b/lib/python/ZEO/__init__.py
--- a/lib/python/ZEO/auth/__init__.py
+++ b/lib/python/ZEO/auth/__init__.py
--- a/lib/python/ZEO/auth/auth_digest.py
+++ b/lib/python/ZEO/auth/auth_digest.py
--- a/lib/python/ZEO/auth/base.py
+++ b/lib/python/ZEO/auth/base.py
--- a/lib/python/ZEO/auth/hmac.py
+++ b/lib/python/ZEO/auth/hmac.py
--- a/lib/python/ZEO/cache.py
+++ b/lib/python/ZEO/cache.py
--- a/lib/python/ZEO/component.xml
+++ b/lib/python/ZEO/component.xml
--- a/lib/python/ZEO/mkzeoinst.py
+++ b/lib/python/ZEO/mkzeoinst.py
--- a/lib/python/ZEO/monitor.py
+++ b/lib/python/ZEO/monitor.py
--- a/lib/python/ZEO/runzeo.py
+++ b/lib/python/ZEO/runzeo.py
--- a/lib/python/ZEO/schema.xml
+++ b/lib/python/ZEO/schema.xml
--- a/lib/python/ZEO/simul.py
+++ b/lib/python/ZEO/simul.py
--- a/lib/python/ZEO/stats.py
+++ b/lib/python/ZEO/stats.py
--- a/lib/python/ZEO/tests/Cache.py
+++ b/lib/python/ZEO/tests/Cache.py
--- a/lib/python/ZEO/tests/CommitLockTests.py
+++ b/lib/python/ZEO/tests/CommitLockTests.py
--- a/lib/python/ZEO/tests/ConnectionTests.py
+++ b/lib/python/ZEO/tests/ConnectionTests.py
--- a/lib/python/ZEO/tests/InvalidationTests.py
+++ b/lib/python/ZEO/tests/InvalidationTests.py
--- a/lib/python/ZEO/tests/TestThread.py
+++ b/lib/python/ZEO/tests/TestThread.py
--- a/lib/python/ZEO/tests/ThreadTests.py
+++ b/lib/python/ZEO/tests/ThreadTests.py
--- a/lib/python/ZEO/tests/__init__.py
+++ b/lib/python/ZEO/tests/__init__.py
--- a/lib/python/ZEO/tests/auth_plaintext.py
+++ b/lib/python/ZEO/tests/auth_plaintext.py
--- a/lib/python/ZEO/tests/deadlock.py
+++ b/lib/python/ZEO/tests/deadlock.py
--- a/lib/python/ZEO/tests/forker.py
+++ b/lib/python/ZEO/tests/forker.py
--- a/lib/python/ZEO/tests/multi.py
+++ b/lib/python/ZEO/tests/multi.py
--- a/lib/python/ZEO/tests/speed.py
+++ b/lib/python/ZEO/tests/speed.py
--- a/lib/python/ZEO/tests/stress.py
+++ b/lib/python/ZEO/tests/stress.py
--- a/lib/python/ZEO/tests/testAuth.py
+++ b/lib/python/ZEO/tests/testAuth.py
--- a/lib/python/ZEO/tests/testConnection.py
+++ b/lib/python/ZEO/tests/testConnection.py
--- a/lib/python/ZEO/tests/testMonitor.py
+++ b/lib/python/ZEO/tests/testMonitor.py
--- a/lib/python/ZEO/tests/testTransactionBuffer.py
+++ b/lib/python/ZEO/tests/testTransactionBuffer.py
--- a/lib/python/ZEO/tests/testZEO.py
+++ b/lib/python/ZEO/tests/testZEO.py
--- a/lib/python/ZEO/tests/testZEOOptions.py
+++ b/lib/python/ZEO/tests/testZEOOptions.py
--- a/lib/python/ZEO/tests/test_cache.py
+++ b/lib/python/ZEO/tests/test_cache.py
--- a/lib/python/ZEO/tests/zeoserver.py
+++ b/lib/python/ZEO/tests/zeoserver.py
--- a/lib/python/ZEO/util.py
+++ b/lib/python/ZEO/util.py
--- a/lib/python/ZEO/version.txt
+++ b/lib/python/ZEO/version.txt
--- a/lib/python/ZEO/zeoctl.py
+++ b/lib/python/ZEO/zeoctl.py
--- a/lib/python/ZEO/zeoctl.xml
+++ b/lib/python/ZEO/zeoctl.xml
--- a/lib/python/ZEO/zeopasswd.py
+++ b/lib/python/ZEO/zeopasswd.py
--- a/lib/python/ZEO/zrpc/__init__.py
+++ b/lib/python/ZEO/zrpc/__init__.py
--- a/lib/python/ZEO/zrpc/_hmac.py
+++ b/lib/python/ZEO/zrpc/_hmac.py
--- a/lib/python/ZEO/zrpc/client.py
+++ b/lib/python/ZEO/zrpc/client.py
--- a/lib/python/ZEO/zrpc/connection.py
+++ b/lib/python/ZEO/zrpc/connection.py
--- a/lib/python/ZEO/zrpc/error.py
+++ b/lib/python/ZEO/zrpc/error.py
--- a/lib/python/ZEO/zrpc/log.py
+++ b/lib/python/ZEO/zrpc/log.py
--- a/lib/python/ZEO/zrpc/marshal.py
+++ b/lib/python/ZEO/zrpc/marshal.py
--- a/lib/python/ZEO/zrpc/server.py
+++ b/lib/python/ZEO/zrpc/server.py
--- a/lib/python/ZEO/zrpc/smac.py
+++ b/lib/python/ZEO/zrpc/smac.py
--- a/lib/python/ZEO/zrpc/trigger.py
+++ b/lib/python/ZEO/zrpc/trigger.py
--- a/lib/python/ZODB/ActivityMonitor.py
+++ b/lib/python/ZODB/ActivityMonitor.py
--- a/lib/python/ZODB/BaseStorage.py
+++ b/lib/python/ZODB/BaseStorage.py
--- a/lib/python/ZODB/ConflictResolution.py
+++ b/lib/python/ZODB/ConflictResolution.py
--- a/lib/python/ZODB/Connection.py
+++ b/lib/python/ZODB/Connection.py
--- a/lib/python/ZODB/DB.py
+++ b/lib/python/ZODB/DB.py
--- a/lib/python/ZODB/DEPENDENCIES.cfg
+++ b/lib/python/ZODB/DEPENDENCIES.cfg
--- a/lib/python/ZODB/DemoStorage.py
+++ b/lib/python/ZODB/DemoStorage.py
--- a/lib/python/ZODB/ExportImport.py
+++ b/lib/python/ZODB/ExportImport.py
--- a/lib/python/ZODB/FileStorage/FileStorage.py
+++ b/lib/python/ZODB/FileStorage/FileStorage.py
--- a/lib/python/ZODB/FileStorage/__init__.py
+++ b/lib/python/ZODB/FileStorage/__init__.py
--- a/lib/python/ZODB/FileStorage/format.py
+++ b/lib/python/ZODB/FileStorage/format.py
--- a/lib/python/ZODB/FileStorage/fsdump.py
+++ b/lib/python/ZODB/FileStorage/fsdump.py
--- a/lib/python/ZODB/FileStorage/fspack.py
+++ b/lib/python/ZODB/FileStorage/fspack.py
--- a/lib/python/ZODB/MappingStorage.py
+++ b/lib/python/ZODB/MappingStorage.py
--- a/lib/python/ZODB/Mount.py
+++ b/lib/python/ZODB/Mount.py
--- a/lib/python/ZODB/POSException.py
+++ b/lib/python/ZODB/POSException.py
--- a/lib/python/ZODB/SETUP.cfg
+++ b/lib/python/ZODB/SETUP.cfg
--- a/lib/python/ZODB/TmpStore.py
+++ b/lib/python/ZODB/TmpStore.py
--- a/lib/python/ZODB/UndoLogCompatible.py
+++ b/lib/python/ZODB/UndoLogCompatible.py
--- a/lib/python/ZODB/ZApplication.py
+++ b/lib/python/ZODB/ZApplication.py
--- a/lib/python/ZODB/__init__.py
+++ b/lib/python/ZODB/__init__.py
--- a/lib/python/ZODB/broken.py
+++ b/lib/python/ZODB/broken.py
--- a/lib/python/ZODB/component.xml
+++ b/lib/python/ZODB/component.xml
--- a/lib/python/ZODB/config.py
+++ b/lib/python/ZODB/config.py
--- a/lib/python/ZODB/config.xml
+++ b/lib/python/ZODB/config.xml
--- a/lib/python/ZODB/conversionhack.py
+++ b/lib/python/ZODB/conversionhack.py
--- a/lib/python/ZODB/dbmStorage.py
+++ b/lib/python/ZODB/dbmStorage.py
--- a/lib/python/ZODB/fsIndex.py
+++ b/lib/python/ZODB/fsIndex.py
--- a/lib/python/ZODB/fsrecover.py
+++ b/lib/python/ZODB/fsrecover.py
--- a/lib/python/ZODB/fstools.py
+++ b/lib/python/ZODB/fstools.py
--- a/lib/python/ZODB/interfaces.py
+++ b/lib/python/ZODB/interfaces.py
--- a/lib/python/ZODB/lock_file.py
+++ b/lib/python/ZODB/lock_file.py
--- a/lib/python/ZODB/loglevels.py
+++ b/lib/python/ZODB/loglevels.py
--- a/lib/python/ZODB/serialize.py
+++ b/lib/python/ZODB/serialize.py
--- a/lib/python/ZODB/storage.xml
+++ b/lib/python/ZODB/storage.xml
--- a/lib/python/ZODB/subtransactions.txt
+++ b/lib/python/ZODB/subtransactions.txt
--- a/lib/python/ZODB/tests/BasicStorage.py
+++ b/lib/python/ZODB/tests/BasicStorage.py
--- a/lib/python/ZODB/tests/ConflictResolution.py
+++ b/lib/python/ZODB/tests/ConflictResolution.py
--- a/lib/python/ZODB/tests/Corruption.py
+++ b/lib/python/ZODB/tests/Corruption.py
--- a/lib/python/ZODB/tests/HistoryStorage.py
+++ b/lib/python/ZODB/tests/HistoryStorage.py
--- a/lib/python/ZODB/tests/IteratorStorage.py
+++ b/lib/python/ZODB/tests/IteratorStorage.py
--- a/lib/python/ZODB/tests/LocalStorage.py
+++ b/lib/python/ZODB/tests/LocalStorage.py
--- a/lib/python/ZODB/tests/MTStorage.py
+++ b/lib/python/ZODB/tests/MTStorage.py
--- a/lib/python/ZODB/tests/MinPO.py
+++ b/lib/python/ZODB/tests/MinPO.py
--- a/lib/python/ZODB/tests/PackableStorage.py
+++ b/lib/python/ZODB/tests/PackableStorage.py
--- a/lib/python/ZODB/tests/PersistentStorage.py
+++ b/lib/python/ZODB/tests/PersistentStorage.py
--- a/lib/python/ZODB/tests/ReadOnlyStorage.py
+++ b/lib/python/ZODB/tests/ReadOnlyStorage.py
--- a/lib/python/ZODB/tests/RecoveryStorage.py
+++ b/lib/python/ZODB/tests/RecoveryStorage.py
--- a/lib/python/ZODB/tests/RevisionStorage.py
+++ b/lib/python/ZODB/tests/RevisionStorage.py
--- a/lib/python/ZODB/tests/StorageTestBase.py
+++ b/lib/python/ZODB/tests/StorageTestBase.py
--- a/lib/python/ZODB/tests/Synchronization.py
+++ b/lib/python/ZODB/tests/Synchronization.py
--- a/lib/python/ZODB/tests/TransactionalUndoStorage.py
+++ b/lib/python/ZODB/tests/TransactionalUndoStorage.py
--- a/lib/python/ZODB/tests/TransactionalUndoVersionStorage.py
+++ b/lib/python/ZODB/tests/TransactionalUndoVersionStorage.py
--- a/lib/python/ZODB/tests/VersionStorage.py
+++ b/lib/python/ZODB/tests/VersionStorage.py
--- a/lib/python/ZODB/tests/__init__.py
+++ b/lib/python/ZODB/tests/__init__.py
--- a/lib/python/ZODB/tests/dangle.py
+++ b/lib/python/ZODB/tests/dangle.py
--- a/lib/python/ZODB/tests/loggingsupport.py
+++ b/lib/python/ZODB/tests/loggingsupport.py
--- a/lib/python/ZODB/tests/sampledm.py
+++ b/lib/python/ZODB/tests/sampledm.py
--- a/lib/python/ZODB/tests/speed.py
+++ b/lib/python/ZODB/tests/speed.py
--- a/lib/python/ZODB/tests/testActivityMonitor.py
+++ b/lib/python/ZODB/tests/testActivityMonitor.py
--- a/lib/python/ZODB/tests/testBroken.py
+++ b/lib/python/ZODB/tests/testBroken.py
--- a/lib/python/ZODB/tests/testCache.py
+++ b/lib/python/ZODB/tests/testCache.py
--- a/lib/python/ZODB/tests/testConfig.py
+++ b/lib/python/ZODB/tests/testConfig.py
--- a/lib/python/ZODB/tests/testConnection.py
+++ b/lib/python/ZODB/tests/testConnection.py
--- a/lib/python/ZODB/tests/testDB.py
+++ b/lib/python/ZODB/tests/testDB.py
--- a/lib/python/ZODB/tests/testDemoStorage.py
+++ b/lib/python/ZODB/tests/testDemoStorage.py
--- a/lib/python/ZODB/tests/testFileStorage.py
+++ b/lib/python/ZODB/tests/testFileStorage.py
--- a/lib/python/ZODB/tests/testMappingStorage.py
+++ b/lib/python/ZODB/tests/testMappingStorage.py
--- a/lib/python/ZODB/tests/testPersistentList.py
+++ b/lib/python/ZODB/tests/testPersistentList.py
--- a/lib/python/ZODB/tests/testPersistentMapping.py
+++ b/lib/python/ZODB/tests/testPersistentMapping.py
--- a/lib/python/ZODB/tests/testRecover.py
+++ b/lib/python/ZODB/tests/testRecover.py
--- a/lib/python/ZODB/tests/testSerialize.py
+++ b/lib/python/ZODB/tests/testSerialize.py
--- a/lib/python/ZODB/tests/testSubTransaction.py
+++ b/lib/python/ZODB/tests/testSubTransaction.py
--- a/lib/python/ZODB/tests/testTimeStamp.py
+++ b/lib/python/ZODB/tests/testTimeStamp.py
--- a/lib/python/ZODB/tests/testUtils.py
+++ b/lib/python/ZODB/tests/testUtils.py
--- a/lib/python/ZODB/tests/testZODB.py
+++ b/lib/python/ZODB/tests/testZODB.py
--- a/lib/python/ZODB/tests/test_cache.py
+++ b/lib/python/ZODB/tests/test_cache.py
--- a/lib/python/ZODB/tests/test_datamanageradapter.py
+++ b/lib/python/ZODB/tests/test_datamanageradapter.py
--- a/lib/python/ZODB/tests/test_storage.py
+++ b/lib/python/ZODB/tests/test_storage.py
--- a/lib/python/ZODB/tests/testfsIndex.py
+++ b/lib/python/ZODB/tests/testfsIndex.py
--- a/lib/python/ZODB/tests/testmvcc.py
+++ b/lib/python/ZODB/tests/testmvcc.py
--- a/lib/python/ZODB/tests/util.py
+++ b/lib/python/ZODB/tests/util.py
--- a/lib/python/ZODB/tests/warnhook.py
+++ b/lib/python/ZODB/tests/warnhook.py
--- a/lib/python/ZODB/transact.py
+++ b/lib/python/ZODB/transact.py
--- a/lib/python/ZODB/utils.py
+++ b/lib/python/ZODB/utils.py
--- a/lib/python/ZODB/winlock.c
+++ b/lib/python/ZODB/winlock.c
--- a/lib/python/ZopeUndo/Prefix.py
+++ b/lib/python/ZopeUndo/Prefix.py
--- a/lib/python/ZopeUndo/__init__.py
+++ b/lib/python/ZopeUndo/__init__.py
--- a/lib/python/ZopeUndo/tests/__init__.py
+++ b/lib/python/ZopeUndo/tests/__init__.py
--- a/lib/python/ZopeUndo/tests/testPrefix.py
+++ b/lib/python/ZopeUndo/tests/testPrefix.py
--- a/lib/python/persistent/DEPENDENCIES.cfg
+++ b/lib/python/persistent/DEPENDENCIES.cfg
--- a/lib/python/persistent/README.txt
+++ b/lib/python/persistent/README.txt
--- a/lib/python/persistent/SETUP.cfg
+++ b/lib/python/persistent/SETUP.cfg
--- a/lib/python/persistent/TimeStamp.c
+++ b/lib/python/persistent/TimeStamp.c
--- a/lib/python/persistent/__init__.py
+++ b/lib/python/persistent/__init__.py
--- a/lib/python/persistent/cPersistence.c
+++ b/lib/python/persistent/cPersistence.c
--- a/lib/python/persistent/cPersistence.h
+++ b/lib/python/persistent/cPersistence.h
--- a/lib/python/persistent/cPickleCache.c
+++ b/lib/python/persistent/cPickleCache.c
--- a/lib/python/persistent/dict.py
+++ b/lib/python/persistent/dict.py
--- a/lib/python/persistent/interfaces.py
+++ b/lib/python/persistent/interfaces.py
--- a/lib/python/persistent/list.py
+++ b/lib/python/persistent/list.py
--- a/lib/python/persistent/mapping.py
+++ b/lib/python/persistent/mapping.py
--- a/lib/python/persistent/ring.c
+++ b/lib/python/persistent/ring.c
--- a/lib/python/persistent/ring.h
+++ b/lib/python/persistent/ring.h
--- a/lib/python/persistent/tests/__init__.py
+++ b/lib/python/persistent/tests/__init__.py
--- a/lib/python/persistent/tests/persistent.txt
+++ b/lib/python/persistent/tests/persistent.txt
--- a/lib/python/persistent/tests/persistenttestbase.py
+++ b/lib/python/persistent/tests/persistenttestbase.py
--- a/lib/python/persistent/tests/testPersistent.py
+++ b/lib/python/persistent/tests/testPersistent.py
--- a/lib/python/persistent/tests/test_PickleCache.py
+++ b/lib/python/persistent/tests/test_PickleCache.py
--- a/lib/python/persistent/tests/test_list.py
+++ b/lib/python/persistent/tests/test_list.py
--- a/lib/python/persistent/tests/test_overriding_attrs.py
+++ b/lib/python/persistent/tests/test_overriding_attrs.py
--- a/lib/python/persistent/tests/test_persistent.py
+++ b/lib/python/persistent/tests/test_persistent.py
--- a/lib/python/persistent/tests/test_pickle.py
+++ b/lib/python/persistent/tests/test_pickle.py
--- a/lib/python/persistent/tests/test_wref.py
+++ b/lib/python/persistent/tests/test_wref.py
--- a/lib/python/persistent/wref.py
+++ b/lib/python/persistent/wref.py
--- a/lib/python/transaction/DEPENDENCIES.cfg
+++ b/lib/python/transaction/DEPENDENCIES.cfg
--- a/lib/python/transaction/README.txt
+++ b/lib/python/transaction/README.txt
--- a/lib/python/transaction/__init__.py
+++ b/lib/python/transaction/__init__.py
--- a/lib/python/transaction/_manager.py
+++ b/lib/python/transaction/_manager.py
--- a/lib/python/transaction/_transaction.py
+++ b/lib/python/transaction/_transaction.py
--- a/lib/python/transaction/interfaces.py
+++ b/lib/python/transaction/interfaces.py
--- a/lib/python/transaction/notes.txt
+++ b/lib/python/transaction/notes.txt
--- a/lib/python/transaction/tests/__init__.py
+++ b/lib/python/transaction/tests/__init__.py
--- a/lib/python/transaction/tests/abstestIDataManager.py
+++ b/lib/python/transaction/tests/abstestIDataManager.py
--- a/lib/python/transaction/tests/test_SampleDataManager.py
+++ b/lib/python/transaction/tests/test_SampleDataManager.py
--- a/lib/python/transaction/tests/test_register_compat.py
+++ b/lib/python/transaction/tests/test_register_compat.py
--- a/lib/python/transaction/tests/test_transaction.py
+++ b/lib/python/transaction/tests/test_transaction.py
--- a/lib/python/transaction/tests/test_util.py
+++ b/lib/python/transaction/tests/test_util.py
--- a/lib/python/transaction/util.py
+++ b/lib/python/transaction/util.py
--- a/utilities/ZODBTools/README.txt
+++ b/utilities/ZODBTools/README.txt
--- a/utilities/ZODBTools/analyze.py
+++ b/utilities/ZODBTools/analyze.py
--- a/utilities/ZODBTools/checkbtrees.py
+++ b/utilities/ZODBTools/checkbtrees.py
--- a/utilities/ZODBTools/fsdump.py
+++ b/utilities/ZODBTools/fsdump.py
--- a/utilities/ZODBTools/fsrefs.py
+++ b/utilities/ZODBTools/fsrefs.py
--- a/utilities/ZODBTools/fsstats.py
+++ b/utilities/ZODBTools/fsstats.py
--- a/utilities/ZODBTools/fstail.py
+++ b/utilities/ZODBTools/fstail.py
--- a/utilities/ZODBTools/fstest.py
+++ b/utilities/ZODBTools/fstest.py
--- a/utilities/ZODBTools/migrate.py
+++ b/utilities/ZODBTools/migrate.py
--- a/utilities/ZODBTools/netspace.py
+++ b/utilities/ZODBTools/netspace.py
--- a/utilities/ZODBTools/parsezeolog.py
+++ b/utilities/ZODBTools/parsezeolog.py
--- a/utilities/ZODBTools/repozo.py
+++ b/utilities/ZODBTools/repozo.py
--- a/utilities/ZODBTools/space.py
+++ b/utilities/ZODBTools/space.py
--- a/utilities/ZODBTools/tests/test-checker.fs
+++ b/utilities/ZODBTools/tests/test-checker.fs
--- a/utilities/ZODBTools/tests/testfstest.py
+++ b/utilities/ZODBTools/tests/testfstest.py
--- a/utilities/ZODBTools/tests/testrepozo.py
+++ b/utilities/ZODBTools/tests/testrepozo.py
--- a/utilities/ZODBTools/tests/testzeopack.py
+++ b/utilities/ZODBTools/tests/testzeopack.py
--- a/utilities/ZODBTools/timeout.py
+++ b/utilities/ZODBTools/timeout.py
--- a/utilities/ZODBTools/zeopack.py
+++ b/utilities/ZODBTools/zeopack.py
--- a/utilities/ZODBTools/zeoqueue.py
+++ b/utilities/ZODBTools/zeoqueue.py
--- a/utilities/ZODBTools/zeoreplay.py
+++ b/utilities/ZODBTools/zeoreplay.py
--- a/utilities/ZODBTools/zeoserverlog.py
+++ b/utilities/ZODBTools/zeoserverlog.py
--- a/utilities/ZODBTools/zeoup.py
+++ b/utilities/ZODBTools/zeoup.py
--- a/utilities/ZODBTools/zodbload.py
+++ b/utilities/ZODBTools/zodbload.py