Eat some low hanging fruit... let the test suite run.

diff --git a/Lib/bsddb/test/test_basics.py b/Lib/bsddb/test/test_basics.py
index 4f8eaea4bedc8fd526b0f12c145c74df3d0e068b..7bfe03bdce0deb897d850fce8355596cd8d34656 100644 (file)
--- a/Lib/bsddb/test/test_basics.py
+++ b/Lib/bsddb/test/test_basics.py
@@ -23,7 +23,7 @@ except ImportError:
 from .test_all import verbose
 
 DASH = b'-'
-
+letters = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
 
 #----------------------------------------------------------------------
 
@@ -886,7 +886,7 @@ class BasicMultiDBTestCase(BasicTestCase):
             x = x.encode("ascii")
             d2.put(x, self.makeData(x))
 
-        for x in string.letters:
+        for x in letters:
             x = x.encode("ascii")
             d3.put(x, x*70)
 
@@ -942,6 +942,7 @@ class BasicMultiDBTestCase(BasicTestCase):
         c2.close()
         c3.close()
 
+        d1.close()
         d2.close()
         d3.close()
 

diff --git a/Lib/bsddb/test/test_dbshelve.py b/Lib/bsddb/test/test_dbshelve.py
index f7731564781355bdd2a11575dc6cc698e11bc410..3747dce4f679ab877867ee6cd288c985773d55e6 100644 (file)
--- a/Lib/bsddb/test/test_dbshelve.py
+++ b/Lib/bsddb/test/test_dbshelve.py
@@ -37,6 +37,8 @@ class DataClass:
             other = other.value
         return value < other
 
+letters = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
+
 class DBShelveTestCase(unittest.TestCase):
     def setUp(self):
         self.filename = tempfile.mktemp()
@@ -50,7 +52,7 @@ class DBShelveTestCase(unittest.TestCase):
             pass
 
     def populateDB(self, d):
-        for x in string.letters:
+        for x in letters:
             d[('S' + x).encode("ascii")] = 10 * x           # add a string
             d[('I' + x).encode("ascii")] = ord(x)           # add an integer
             d[('L' + x).encode("ascii")] = [x] * 10         # add a list

diff --git a/Lib/bsddb/test/test_get_none.py b/Lib/bsddb/test/test_get_none.py
index 63130d57bd234117fedebf542b2480529c388f9b..8829944f16e130844011e0b0994ad6a75bff07fc 100644 (file)
--- a/Lib/bsddb/test/test_get_none.py
+++ b/Lib/bsddb/test/test_get_none.py
@@ -11,6 +11,7 @@ from bsddb import db
 
 from .test_all import verbose
 
+letters = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
 
 #----------------------------------------------------------------------
 
@@ -30,7 +31,7 @@ class GetReturnsNoneTestCase(unittest.TestCase):
         d.open(self.filename, db.DB_BTREE, db.DB_CREATE)
         d.set_get_returns_none(1)
 
-        for x in string.letters:
+        for x in letters:
             x = x.encode("ascii")
             d.put(x, x * 40)
 
@@ -59,7 +60,7 @@ class GetReturnsNoneTestCase(unittest.TestCase):
         d.open(self.filename, db.DB_BTREE, db.DB_CREATE)
         d.set_get_returns_none(0)
 
-        for x in string.letters:
+        for x in letters:
             x = x.encode("ascii")
             d.put(x, x * 40)
 

diff --git a/Lib/bsddb/test/test_queue.py b/Lib/bsddb/test/test_queue.py
index 9f80b4362ffcbdf0f2628146a6d58af97acba4b8..e20737ea2542d09644f75af302073106434c6461 100644 (file)
--- a/Lib/bsddb/test/test_queue.py
+++ b/Lib/bsddb/test/test_queue.py
@@ -16,6 +16,7 @@ except ImportError:
 
 from .test_all import verbose
 
+letters = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
 
 #----------------------------------------------------------------------
 
@@ -45,7 +46,7 @@ class SimpleQueueTestCase(unittest.TestCase):
             print("before appends" + '-' * 30)
             pprint(d.stat())
 
-        for x in string.letters:
+        for x in letters:
             d.append(x * 40)
 
         assert len(d) == 52
@@ -117,7 +118,7 @@ class SimpleQueueTestCase(unittest.TestCase):
             print("before appends" + '-' * 30)
             pprint(d.stat())
 
-        for x in string.letters:
+        for x in letters:
             d.append(x * 40)
 
         assert len(d) == 52