[Zodb-checkins] CVS: ZODB3/ZODB/tests - testZODB.py:1.12

Jeremy Hylton jeremy at zope.com
Tue Apr 22 15:39:38 EDT 2003


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

Modified Files:
	testZODB.py 
Log Message:
Python 2.1 compatibility.


=== ZODB3/ZODB/tests/testZODB.py 1.11 => 1.12 ===
--- ZODB3/ZODB/tests/testZODB.py:1.11	Tue Apr 22 14:04:37 2003
+++ ZODB3/ZODB/tests/testZODB.py	Tue Apr 22 14:39:38 2003
@@ -11,6 +11,8 @@
 # FOR A PARTICULAR PURPOSE.
 # 
 ##############################################################################
+from __future__ import nested_scopes
+
 import unittest
 
 import ZODB
@@ -250,14 +252,14 @@
         real_data2 = r2["real_data"]
         index2 = r2["index"]
 
-        real_data["b"]["indexed_value"] = False
+        real_data["b"]["indexed_value"] = 0
         del index[1]["b"]
         index[0]["b"] = 1
         cn2.getTransaction().commit()
 
         del real_data2["a"]
         try:
-            del index2[False]["a"]
+            del index2[0]["a"]
         except ReadConflictError:
             # This is the crux of the text.  Ignore the error.
             pass
@@ -277,7 +279,7 @@
 
     def checkIndependent(self):
         self.obj = Independent()
-        self.readConflict(shouldFail=False)
+        self.readConflict(shouldFail=0)
 
     def checkNotIndependent(self):
         self.obj = DecoyIndependent()




More information about the Zodb-checkins mailing list