Mon Sep 15 17:27:31 EDT 2003

Update of /cvs-repository/ZODB3/ZODB/tests
In directory cvs.zope.org:/tmp/cvs-serv17778/ZODB/tests

Modified Files:
      Tag: Zope-2_7-branch
	BasicStorage.py ConflictResolution.py Corruption.py 
	HistoryStorage.py IteratorStorage.py LocalStorage.py MinPO.py 
	PackableStorage.py PersistentStorage.py ReadOnlyStorage.py 
	RecoveryStorage.py RevisionStorage.py StorageTestBase.py 
	Synchronization.py TransactionalUndoStorage.py 
	TransactionalUndoVersionStorage.py VersionStorage.py dangle.py 
	testCache.py testDB.py testFileStorage.py 
	testPersistentList.py testPersistentMapping.py testRecover.py 
	testTimeStamp.py testTransaction.py testUtils.py testZODB.py 
	testfsIndex.py 
Log Message:
Whitespace normalization (via Python's reindent.py script).


=== ZODB3/ZODB/tests/BasicStorage.py 1.24 => 1.24.6.1 ===

--- ZODB3/ZODB/tests/BasicStorage.py:1.24	Fri May 30 14:26:13 2003
+++ ZODB3/ZODB/tests/BasicStorage.py	Mon Sep 15 17:26:57 2003
@@ -2,14 +2,14 @@
 #
 # Copyright (c) 2001, 2002 Zope Corporation and Contributors.
 # All Rights Reserved.
-# 
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE.
-# 
+#
 ##############################################################################
 """Run the basic tests for a storage as described in the official storage API
 


=== ZODB3/ZODB/tests/ConflictResolution.py 1.10 => 1.10.34.1 ===
--- ZODB3/ZODB/tests/ConflictResolution.py:1.10	Thu Dec  5 19:00:53 2002
+++ ZODB3/ZODB/tests/ConflictResolution.py	Mon Sep 15 17:26:57 2003
@@ -2,14 +2,14 @@
 #
 # Copyright (c) 2001, 2002 Zope Corporation and Contributors.
 # All Rights Reserved.
-# 
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE.
-# 
+#
 ##############################################################################
 """Tests for application-level conflict resolution."""
 


=== ZODB3/ZODB/tests/Corruption.py 1.7 => 1.7.34.1 ===
--- ZODB3/ZODB/tests/Corruption.py:1.7	Thu Dec  5 19:00:53 2002
+++ ZODB3/ZODB/tests/Corruption.py	Mon Sep 15 17:26:57 2003
@@ -2,14 +2,14 @@
 #
 # Copyright (c) 2001, 2002 Zope Corporation and Contributors.
 # All Rights Reserved.
-# 
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE.
-# 
+#
 ##############################################################################
 """Do some minimal tests of data corruption"""
 


=== ZODB3/ZODB/tests/HistoryStorage.py 1.10 => 1.10.6.1 ===
--- ZODB3/ZODB/tests/HistoryStorage.py:1.10	Fri May 30 05:24:44 2003
+++ ZODB3/ZODB/tests/HistoryStorage.py	Mon Sep 15 17:26:57 2003
@@ -2,14 +2,14 @@
 #
 # Copyright (c) 2001, 2002 Zope Corporation and Contributors.
 # All Rights Reserved.
-# 
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE.
-# 
+#
 ##############################################################################
 """Run the history() related tests for a storage.
 


=== ZODB3/ZODB/tests/IteratorStorage.py 1.16 => 1.16.20.1 ===
--- ZODB3/ZODB/tests/IteratorStorage.py:1.16	Mon Jan 20 14:09:04 2003
+++ ZODB3/ZODB/tests/IteratorStorage.py	Mon Sep 15 17:26:57 2003
@@ -2,14 +2,14 @@
 #
 # Copyright (c) 2001, 2002 Zope Corporation and Contributors.
 # All Rights Reserved.
-# 
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE.
-# 
+#
 ##############################################################################
 """Run tests against the iterator() interface for storages.
 


=== ZODB3/ZODB/tests/LocalStorage.py 1.3 => 1.3.34.1 ===
--- ZODB3/ZODB/tests/LocalStorage.py:1.3	Thu Dec  5 19:00:53 2002
+++ ZODB3/ZODB/tests/LocalStorage.py	Mon Sep 15 17:26:57 2003
@@ -2,14 +2,14 @@
 #
 # Copyright (c) 2001, 2002 Zope Corporation and Contributors.
 # All Rights Reserved.
-# 
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE.
-# 
+#
 ##############################################################################
 class LocalStorage:
     """A single test that only make sense for local storages.


=== ZODB3/ZODB/tests/MinPO.py 1.3 => 1.3.34.1 ===
--- ZODB3/ZODB/tests/MinPO.py:1.3	Thu Dec  5 19:00:53 2002
+++ ZODB3/ZODB/tests/MinPO.py	Mon Sep 15 17:26:57 2003
@@ -2,14 +2,14 @@
 #
 # Copyright (c) 2001, 2002 Zope Corporation and Contributors.
 # All Rights Reserved.
-# 
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE.
-# 
+#
 ##############################################################################
 """A minimal persistent object to use for tests"""
 


=== ZODB3/ZODB/tests/PackableStorage.py 1.20.6.1 => 1.20.6.2 ===
--- ZODB3/ZODB/tests/PackableStorage.py:1.20.6.1	Mon Sep 15 14:02:57 2003
+++ ZODB3/ZODB/tests/PackableStorage.py	Mon Sep 15 17:26:57 2003
@@ -2,14 +2,14 @@
 #
 # Copyright (c) 2001, 2002 Zope Corporation and Contributors.
 # All Rights Reserved.
-# 
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE.
-# 
+#
 ##############################################################################
 """Run some tests relevant for storages that support pack()."""
 
@@ -472,13 +472,13 @@
         obj2 = self._newobj()
         oid2 = obj2.getoid()
         obj2.value = 2
-        
+
         # Commit the first revision of each of them
         revid11 = self._dostoreNP(oid1, data=pickle.dumps(obj1),
                                   description="1-1")
         revid22 = self._dostoreNP(oid2, data=pickle.dumps(obj2),
                                   description="2-2")
-        
+
         # remember the time. everything above here will be packed away
         snooze()
         packtime = time.time()
@@ -509,7 +509,7 @@
     def __init__(self, db):
         threading.Thread.__init__(self)
         self.root = db.open().root()
-        
+
     def run(self):
         for j in range(50):
             try:


=== ZODB3/ZODB/tests/PersistentStorage.py 1.5 => 1.5.6.1 ===
--- ZODB3/ZODB/tests/PersistentStorage.py:1.5	Thu May 15 03:56:42 2003
+++ ZODB3/ZODB/tests/PersistentStorage.py	Mon Sep 15 17:26:57 2003
@@ -2,14 +2,14 @@
 #
 # Copyright (c) 2001, 2002 Zope Corporation and Contributors.
 # All Rights Reserved.
-# 
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE.
-# 
+#
 ##############################################################################
 """Test that a storage's values persist across open and close."""
 


=== ZODB3/ZODB/tests/ReadOnlyStorage.py 1.6 => 1.6.6.1 ===
--- ZODB3/ZODB/tests/ReadOnlyStorage.py:1.6	Thu May 15 03:56:42 2003
+++ ZODB3/ZODB/tests/ReadOnlyStorage.py	Mon Sep 15 17:26:57 2003
@@ -2,14 +2,14 @@
 #
 # Copyright (c) 2001, 2002 Zope Corporation and Contributors.
 # All Rights Reserved.
-# 
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE.
-# 
+#
 ##############################################################################
 from ZODB.POSException import ReadOnlyError
 from ZODB.Transaction import Transaction


=== ZODB3/ZODB/tests/RecoveryStorage.py 1.8.6.1 => 1.8.6.2 ===
--- ZODB3/ZODB/tests/RecoveryStorage.py:1.8.6.1	Mon Sep 15 14:02:57 2003
+++ ZODB3/ZODB/tests/RecoveryStorage.py	Mon Sep 15 17:26:57 2003
@@ -2,14 +2,14 @@
 #
 # Copyright (c) 2001, 2002 Zope Corporation and Contributors.
 # All Rights Reserved.
-# 
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE.
-# 
+#
 ##############################################################################
 """More recovery and iterator tests."""
 
@@ -71,7 +71,7 @@
             self.assertRaises(IndexError, lambda i, t=trans: t[i], 1)
             self.assertEqual(data.oid, oid)
             self.assertEqual(data.data, None)
-    
+
     def checkRecoverUndoInVersion(self):
         oid = self._storage.new_oid()
         version = "aVersion"
@@ -128,7 +128,7 @@
         self._dst = self.new_dest()
         self._dst.copyTransactionsFrom(self._storage)
         self.compare(self._storage, self._dst)
-        
+
     def checkRestoreAcrossPack(self):
         db = DB(self._storage)
         c = db.open()


=== ZODB3/ZODB/tests/RevisionStorage.py 1.3 => 1.3.34.1 ===
--- ZODB3/ZODB/tests/RevisionStorage.py:1.3	Thu Dec  5 19:00:53 2002
+++ ZODB3/ZODB/tests/RevisionStorage.py	Mon Sep 15 17:26:57 2003
@@ -2,14 +2,14 @@
 #
 # Copyright (c) 2001, 2002 Zope Corporation and Contributors.
 # All Rights Reserved.
-# 
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE.
-# 
+#
 ##############################################################################
 """Check loadSerial() on storages that support historical revisions."""
 


=== ZODB3/ZODB/tests/StorageTestBase.py 1.27 => 1.27.6.1 ===
--- ZODB3/ZODB/tests/StorageTestBase.py:1.27	Fri May 30 05:24:44 2003
+++ ZODB3/ZODB/tests/StorageTestBase.py	Mon Sep 15 17:26:57 2003
@@ -2,14 +2,14 @@
 #
 # Copyright (c) 2001, 2002 Zope Corporation and Contributors.
 # All Rights Reserved.
-# 
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE.
-# 
+#
 ##############################################################################
 """Provide a mixin base class for storage tests.
 
@@ -210,7 +210,7 @@
     def _dostoreNP(self, oid=None, revid=None, data=None, version=None,
                    user=None, description=None):
         return self._dostore(oid, revid, data, version, 1, user, description)
-    
+
     # The following methods depend on optional storage features.
 
     def _undo(self, tid, oid=None):


=== ZODB3/ZODB/tests/Synchronization.py 1.8 => 1.8.34.1 ===
--- ZODB3/ZODB/tests/Synchronization.py:1.8	Thu Dec  5 19:00:53 2002
+++ ZODB3/ZODB/tests/Synchronization.py	Mon Sep 15 17:26:57 2003
@@ -2,14 +2,14 @@
 #
 # Copyright (c) 2001, 2002 Zope Corporation and Contributors.
 # All Rights Reserved.
-# 
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE.
-# 
+#
 ##############################################################################
 """Test the storage's implemenetation of the storage synchronization spec.
 


=== ZODB3/ZODB/tests/TransactionalUndoStorage.py 1.32 => 1.32.6.1 ===
--- ZODB3/ZODB/tests/TransactionalUndoStorage.py:1.32	Fri May 30 05:24:44 2003
+++ ZODB3/ZODB/tests/TransactionalUndoStorage.py	Mon Sep 15 17:26:57 2003
@@ -42,7 +42,7 @@
     now = time.time()
     while now == time.time():
         time.sleep(0.1)
-        
+
 def listeq(L1, L2):
     """Return True if L1.sort() == L2.sort()"""
     c1 = L1[:]
@@ -608,11 +608,11 @@
         txn.commit()
 
         set_pack_time()
-        
+
         root._p_deactivate()
         cn.sync()
         self.assert_(listeq(root.keys(), ["key0", "key2"]))
-        
+
         L = db.undoInfo()
         db.undo(L[0]["id"])
         txn = get_transaction()
@@ -624,7 +624,7 @@
         root._p_deactivate()
         cn.sync()
         self.assert_(listeq(root.keys(), ["key0", "key1", "key2"]))
-        
+
         for t in pack_times:
             self._storage.pack(t, referencesf)
 
@@ -663,7 +663,7 @@
 
             self.assertEqual(rt["test"].value, i % 2 and 3 or 1)
             self.assertEqual(rt["test2"].value, 2)
-            
+
             packtimes.append(time.time())
             snooze()
 
@@ -723,7 +723,7 @@
                 s.transactionalUndo(tid, t)
             s.tpc_vote(t)
             s.tpc_finish(t)
-        
+
         for i in range(BATCHES):
             undo(i)
 
@@ -740,14 +740,14 @@
         for i in range(BATCHES):
             txn = iter[offset]
             offset += 1
-            
+
             tid = p64(i + 1)
             eq(txn.tid, tid)
 
             L1 = [(rec.oid, rec.serial, rec.data_txn) for rec in txn]
             L2 = [(oid, revid, None) for _tid, oid, revid in orig
                   if _tid == tid]
-            
+
             eq(L1, L2)
 
         for i in range(BATCHES * OBJECTS):
@@ -789,5 +789,3 @@
         self.assertEqual(d['description'],'t1')
         self.assertEqual(d['k2'],'this is transaction metadata')
         self.assertEqual(d['user_name'],'p3 u3')
-
-        


=== ZODB3/ZODB/tests/TransactionalUndoVersionStorage.py 1.11 => 1.11.34.1 ===
--- ZODB3/ZODB/tests/TransactionalUndoVersionStorage.py:1.11	Thu Dec  5 19:00:53 2002
+++ ZODB3/ZODB/tests/TransactionalUndoVersionStorage.py	Mon Sep 15 17:26:57 2003
@@ -2,14 +2,14 @@
 #
 # Copyright (c) 2001, 2002 Zope Corporation and Contributors.
 # All Rights Reserved.
-# 
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE.
-# 
+#
 ##############################################################################
 from __future__ import nested_scopes
 
@@ -60,7 +60,7 @@
             self.assertEqual(zodb_unpickle(data), MinPO(versiondata))
             data, revid = self._storage.load(oid, '')
             self.assertEqual(zodb_unpickle(data), MinPO(nonversiondata))
-        
+
         oid = self._storage.new_oid()
         version = 'one'
         revid_a = self._dostore(oid, data=MinPO(91))
@@ -68,17 +68,17 @@
                                 version=version)
         revid_c = self._dostore(oid, revid=revid_b, data=MinPO(93),
                                 version=version)
-        
+
         info = self._storage.undoInfo()
         self._undo(info[0]['id'], oid)
-        
+
         data, revid = self._storage.load(oid, '')
         eq(revid, revid_a)
         eq(zodb_unpickle(data), MinPO(91))
         data, revid = self._storage.load(oid, version)
         unless(revid > revid_b and revid > revid_c)
         eq(zodb_unpickle(data), MinPO(92))
-        
+
         # Now commit the version...
         t = Transaction()
         self._storage.tpc_begin(t)
@@ -89,7 +89,7 @@
         eq(oids[0], oid)
 
         check_objects(92, 92)
-        
+
         # ...and undo the commit
         info = self._storage.undoInfo()
         self._undo(info[0]['id'], oid)
@@ -101,11 +101,11 @@
         assert oids[0] == oid
 
         check_objects(91, 91)
-        
+
         # Now undo the abort
         info=self._storage.undoInfo()
         self._undo(info[0]['id'], oid)
-        
+
         check_objects(91, 92)
 
     def checkUndoCommitVersion(self):


=== ZODB3/ZODB/tests/VersionStorage.py 1.23.8.1 => 1.23.8.2 ===
--- ZODB3/ZODB/tests/VersionStorage.py:1.23.8.1	Mon Sep 15 14:02:57 2003
+++ ZODB3/ZODB/tests/VersionStorage.py	Mon Sep 15 17:26:57 2003
@@ -493,7 +493,7 @@
         self._storage.pack(time.time(), referencesf)
         cn.sync()
         cn._cache.clear()
-        
+
         # make sure all the non-version data is there
         for name, obj in root.items():
             self.assertEqual(name, obj.value)
@@ -516,16 +516,15 @@
 
         t = time.time()
         snooze()
-        
+
         L = db.undoInfo()
         db.undo(L[0]["id"])
         txn = get_transaction()
         txn.note("undo abort")
         txn.commit()
-        
+
         self._storage.pack(t, referencesf)
 
         cn2 = db.open(version="b")
         rt2 = cn2.root()
         self.assertEqual(rt2["b"].value.value, "still version")
-            


=== ZODB3/ZODB/tests/dangle.py 1.1 => 1.1.54.1 ===
--- ZODB3/ZODB/tests/dangle.py:1.1	Wed Oct 16 14:33:30 2002
+++ ZODB3/ZODB/tests/dangle.py	Mon Sep 15 17:26:57 2003
@@ -4,14 +4,14 @@
 #
 # Copyright (c) 2002 Zope Corporation and Contributors.
 # All Rights Reserved.
-# 
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE
-# 
+#
 ##############################################################################
 
 """Functional test to produce a dangling reference."""
@@ -61,6 +61,6 @@
     db = DB(fs)
     create_dangling_ref(db)
     db.close()
-    
+
 if __name__ == "__main__":
     main()


=== ZODB3/ZODB/tests/testCache.py 1.13.10.1 => 1.13.10.2 ===
--- ZODB3/ZODB/tests/testCache.py:1.13.10.1	Mon Sep 15 14:02:57 2003
+++ ZODB3/ZODB/tests/testCache.py	Mon Sep 15 17:26:57 2003
@@ -2,14 +2,14 @@
 #
 # Copyright (c) 2001, 2002 Zope Corporation and Contributors.
 # All Rights Reserved.
-# 
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE.
-# 
+#
 ##############################################################################
 """A few simple tests of the public cache API.
 


=== ZODB3/ZODB/tests/testDB.py 1.4 => 1.4.2.1 ===
--- ZODB3/ZODB/tests/testDB.py:1.4	Tue Jun 24 17:29:55 2003
+++ ZODB3/ZODB/tests/testDB.py	Mon Sep 15 17:26:57 2003
@@ -2,14 +2,14 @@
 #
 # Copyright (c) 2001, 2002 Zope Corporation and Contributors.
 # All Rights Reserved.
-# 
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE.
-# 
+#
 ##############################################################################
 import os
 import time
@@ -57,14 +57,14 @@
         # Test that we can remove a version pool
 
         # This is white box because we check some internal data structures
-        
+
         self.dowork()
         self.dowork('v2')
         c1 = self.db.open('v1')
         c1.close() # return to pool
         c12 = self.db.open('v1')
         c12.close() # return to pool
-        self.assert_(c1 is c12) # should be same 
+        self.assert_(c1 is c12) # should be same
 
         pools, pooll = self.db._pools
 
@@ -78,7 +78,7 @@
 
         c12 = self.db.open('v1')
         c12.close() # return to pool
-        self.assert_(c1 is not c12) # should be different 
+        self.assert_(c1 is not c12) # should be different
 
         self.assertEqual(len(pools), 3)
         self.assertEqual(len(pooll), 3)
@@ -95,13 +95,13 @@
         # Test that we can remove a version pool
 
         # This is white box because we check some internal data structures
-        
+
         self.dowork()
         self.dowork('v2')
         c1 = self.db.open('v1')
         c1.close() # return to pool
         c12 = self.db.open('v1')
-        self.assert_(c1 is c12) # should be same 
+        self.assert_(c1 is c12) # should be same
 
         pools, pooll = self.db._pools
 
@@ -120,7 +120,7 @@
 
         c12 = self.db.open('v1')
         c12.close() # return to pool
-        self.assert_(c1 is not c12) # should be different 
+        self.assert_(c1 is not c12) # should be different
 
         self.assertEqual(len(pools), 3)
         self.assertEqual(len(pooll), 3)


=== ZODB3/ZODB/tests/testFileStorage.py 1.32.8.1 => 1.32.8.2 ===
--- ZODB3/ZODB/tests/testFileStorage.py:1.32.8.1	Mon Sep 15 14:02:57 2003
+++ ZODB3/ZODB/tests/testFileStorage.py	Mon Sep 15 17:26:57 2003
@@ -2,14 +2,14 @@
 #
 # Copyright (c) 2001, 2002 Zope Corporation and Contributors.
 # All Rights Reserved.
-# 
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE.
-# 
+#
 ##############################################################################
 from __future__ import nested_scopes
 
@@ -92,21 +92,21 @@
 
 
         from ZODB.fsIndex import fsIndex
-        
+
         # Hack FileStorage to create dictionary indexes
         self._storage = OldFileStorage('FileStorageTests.fs')
 
         self.assertEqual(type(self._storage._index), type({}))
         for i in range(10):
             self._dostore()
-            
+
         # Should save the index
         self._storage.close()
 
         self._storage = ZODB.FileStorage.FileStorage(
             'FileStorageTests.fs', read_only=1)
         self.assertEqual(type(self._storage._index), type({}))
-    
+
     def check_conversion_to_fsIndex(self):
 
         self.tearDown()
@@ -117,16 +117,16 @@
 
 
         from ZODB.fsIndex import fsIndex
-        
+
         # Hack FileStorage to create dictionary indexes
         self._storage = OldFileStorage('FileStorageTests.fs')
 
         self.assertEqual(type(self._storage._index), type({}))
         for i in range(10):
             self._dostore()
-            
+
         oldindex = self._storage._index.copy()
-            
+
         # Should save the index
         self._storage.close()
 
@@ -151,7 +151,7 @@
 
 
     # This would make the unit tests too slow
-    # check_save_after_load_that_worked_hard(self)        
+    # check_save_after_load_that_worked_hard(self)
 
     def check_periodic_save_index(self):
 


=== ZODB3/ZODB/tests/testPersistentList.py 1.3 => 1.3.34.1 ===
--- ZODB3/ZODB/tests/testPersistentList.py:1.3	Thu Dec  5 19:00:52 2002
+++ ZODB3/ZODB/tests/testPersistentList.py	Mon Sep 15 17:26:57 2003
@@ -2,14 +2,14 @@
 #
 # Copyright (c) 2001, 2002 Zope Corporation and Contributors.
 # All Rights Reserved.
-# 
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE.
-# 
+#
 ##############################################################################
 """Test the list interface to PersistentList
 """


=== ZODB3/ZODB/tests/testPersistentMapping.py 1.5 => 1.5.34.1 ===
--- ZODB3/ZODB/tests/testPersistentMapping.py:1.5	Thu Dec  5 19:00:52 2002
+++ ZODB3/ZODB/tests/testPersistentMapping.py	Mon Sep 15 17:26:57 2003
@@ -2,14 +2,14 @@
 #
 # Copyright (c) 2001, 2002 Zope Corporation and Contributors.
 # All Rights Reserved.
-# 
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE.
-# 
+#
 ##############################################################################
 """Verify that PersistentMapping works with old versions of Zope.
 


=== ZODB3/ZODB/tests/testRecover.py 1.3 => 1.3.8.1 ===
--- ZODB3/ZODB/tests/testRecover.py:1.3	Fri May 30 16:00:27 2003
+++ ZODB3/ZODB/tests/testRecover.py	Mon Sep 15 17:26:57 2003
@@ -151,5 +151,3 @@
 
 def test_suite():
     return unittest.makeSuite(RecoverTest)
-
-


=== ZODB3/ZODB/tests/testTimeStamp.py 1.4 => 1.4.34.1 ===
--- ZODB3/ZODB/tests/testTimeStamp.py:1.4	Thu Dec  5 19:00:52 2002
+++ ZODB3/ZODB/tests/testTimeStamp.py	Mon Sep 15 17:26:57 2003
@@ -2,14 +2,14 @@
 #
 # Copyright (c) 2001, 2002 Zope Corporation and Contributors.
 # All Rights Reserved.
-# 
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE.
-# 
+#
 ##############################################################################
 """Test the TimeStamp utility type"""
 


=== ZODB3/ZODB/tests/testTransaction.py 1.12 => 1.12.20.1 ===
--- ZODB3/ZODB/tests/testTransaction.py:1.12	Mon Jan 27 15:29:50 2003
+++ ZODB3/ZODB/tests/testTransaction.py	Mon Sep 15 17:26:57 2003
@@ -599,7 +599,7 @@
 
     # The HoserJars coordinate their actions via the class variable
     # committed.  The check() method will only raise its exception
-    # if committed > 0.  
+    # if committed > 0.
 
     committed = 0
 
@@ -615,7 +615,7 @@
         self.check('tpc_finish')
         self.ctpc_finish += 1
         HoserJar.committed += 1
-        
+
 
 def test_suite():
 


=== ZODB3/ZODB/tests/testUtils.py 1.3 => 1.3.34.1 ===
--- ZODB3/ZODB/tests/testUtils.py:1.3	Thu Dec  5 19:00:52 2002
+++ ZODB3/ZODB/tests/testUtils.py	Mon Sep 15 17:26:57 2003
@@ -2,14 +2,14 @@
 #
 # Copyright (c) 2001, 2002 Zope Corporation and Contributors.
 # All Rights Reserved.
-# 
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE.
-# 
+#
 ##############################################################################
 """Test the routines to convert between long and 64-bit strings"""
 


=== ZODB3/ZODB/tests/testZODB.py 1.15 => 1.15.8.1 ===
--- ZODB3/ZODB/tests/testZODB.py:1.15	Thu May  8 18:43:30 2003
+++ ZODB3/ZODB/tests/testZODB.py	Mon Sep 15 17:26:57 2003
@@ -2,14 +2,14 @@
 #
 # Copyright (c) 2001, 2002 Zope Corporation and Contributors.
 # All Rights Reserved.
-# 
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE.
-# 
+#
 ##############################################################################
 from __future__ import nested_scopes
 
@@ -213,7 +213,7 @@
         r2 = cn2.root()
 
         self.assertEqual(r1._p_serial, r2._p_serial)
-        
+
         self.obj.child2 = P()
         conn.getTransaction().commit()
 


=== ZODB3/ZODB/tests/testfsIndex.py 1.6 => 1.6.34.1 ===
--- ZODB3/ZODB/tests/testfsIndex.py:1.6	Thu Dec  5 19:00:52 2002
+++ ZODB3/ZODB/tests/testfsIndex.py	Mon Sep 15 17:26:57 2003
@@ -2,14 +2,14 @@
 #
 # Copyright (c) 2001, 2002 Zope Corporation and Contributors.
 # All Rights Reserved.
-# 
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE.
-# 
+#
 ##############################################################################
 import unittest, sys
 from ZODB.fsIndex import fsIndex


