__init__.py: keep it compatible with older python (True and False == 1 and 0)

test_basics.py: updated for the set_get_returns_none() default of 2 change.

diff --git a/Lib/bsddb/__init__.py b/Lib/bsddb/__init__.py
index 99499c564308a9251be8194c98b19fed45c1ecd6..9c59b00b2c79c391a0626d1902ee66ad01cecb2c 100644 (file)
--- a/Lib/bsddb/__init__.py
+++ b/Lib/bsddb/__init__.py
@@ -184,7 +184,7 @@ class _DBWithCursor(_iter_mixin):
     # BerkeleyDB deadlocks (due to being opened with DB_INIT_LOCK
     # and DB_THREAD to be thread safe) when intermixing database
     # operations that use the cursor internally with those that don't.
-    def _closeCursors(self, save=True):
+    def _closeCursors(self, save=1):
         if self.dbc:
             c = self.dbc
             self.dbc = None
@@ -223,7 +223,7 @@ class _DBWithCursor(_iter_mixin):
         del self.db[key]
 
     def close(self):
-        self._closeCursors(save=False)
+        self._closeCursors(save=0)
         if self.dbc is not None:
             self.dbc.close()
         v = 0

diff --git a/Lib/bsddb/test/test_basics.py b/Lib/bsddb/test/test_basics.py
index 93a7fb759166e90f89f5f547e1ca4cde9162956e..d757b34185eff4f14ead817e046e9d008645c7d1 100644 (file)
--- a/Lib/bsddb/test/test_basics.py
+++ b/Lib/bsddb/test/test_basics.py
@@ -290,7 +290,7 @@ class BasicTestCase(unittest.TestCase):
 
     #----------------------------------------
 
-    def test03_SimpleCursorStuff(self, get_raises_error=0, set_raises_error=1):
+    def test03_SimpleCursorStuff(self, get_raises_error=0, set_raises_error=0):
         if verbose:
             print '\n', '-=' * 30
             print "Running %s.test03_SimpleCursorStuff (get_error %s, set_error %s)..." % \
@@ -459,9 +459,20 @@ class BasicTestCase(unittest.TestCase):
                   self.__class__.__name__
 
         old = self.d.set_get_returns_none(0)
-        assert old == 1
+        assert old == 2
         self.test03_SimpleCursorStuff(get_raises_error=1, set_raises_error=1)
 
+    def test03b_SimpleCursorWithGetReturnsNone1(self):
+        # same test but raise exceptions instead of returning None
+        if verbose:
+            print '\n', '-=' * 30
+            print "Running %s.test03b_SimpleCursorStuffWithoutGetReturnsNone..." % \
+                  self.__class__.__name__
+
+        old = self.d.set_get_returns_none(1)
+        self.test03_SimpleCursorStuff(get_raises_error=0, set_raises_error=1)
+
+
     def test03c_SimpleCursorGetReturnsNone2(self):
         # same test but raise exceptions instead of returning None
         if verbose:
@@ -469,10 +480,10 @@ class BasicTestCase(unittest.TestCase):
             print "Running %s.test03c_SimpleCursorStuffWithoutSetReturnsNone..." % \
                   self.__class__.__name__
 
+        old = self.d.set_get_returns_none(1)
+        assert old == 2
         old = self.d.set_get_returns_none(2)
         assert old == 1
-        old = self.d.set_get_returns_none(2)
-        assert old == 2
         self.test03_SimpleCursorStuff(get_raises_error=0, set_raises_error=0)
 
     #----------------------------------------