Issue #22943: bsddb tests are locale independend now.
This fixes tests on 8-bit locales (in particular on Windows).
diff --git a/Lib/bsddb/test/test_all.py b/Lib/bsddb/test/test_all.py
index caef1ac..004e357 100644
--- a/Lib/bsddb/test/test_all.py
+++ b/Lib/bsddb/test/test_all.py
@@ -412,9 +412,6 @@
def get_dbp(self) :
return self._db
- import string
- string.letters=[chr(i) for i in xrange(65,91)]
-
bsddb._db.DBEnv_orig = bsddb._db.DBEnv
bsddb._db.DB_orig = bsddb._db.DB
if bsddb.db.version() <= (4, 3) :
diff --git a/Lib/bsddb/test/test_basics.py b/Lib/bsddb/test/test_basics.py
index 3c57be4..1459d36 100644
--- a/Lib/bsddb/test/test_basics.py
+++ b/Lib/bsddb/test/test_basics.py
@@ -999,7 +999,7 @@
for x in "The quick brown fox jumped over the lazy dog".split():
d2.put(x, self.makeData(x))
- for x in string.letters:
+ for x in string.ascii_letters:
d3.put(x, x*70)
d1.sync()
@@ -1047,7 +1047,7 @@
if verbose:
print rec
rec = c3.next()
- self.assertEqual(count, len(string.letters))
+ self.assertEqual(count, len(string.ascii_letters))
c1.close()
diff --git a/Lib/bsddb/test/test_dbshelve.py b/Lib/bsddb/test/test_dbshelve.py
index c3701e1..e5609c5 100644
--- a/Lib/bsddb/test/test_dbshelve.py
+++ b/Lib/bsddb/test/test_dbshelve.py
@@ -59,7 +59,7 @@
return bytes(key, "iso8859-1") # 8 bits
def populateDB(self, d):
- for x in string.letters:
+ for x in string.ascii_letters:
d[self.mk('S' + x)] = 10 * x # add a string
d[self.mk('I' + x)] = ord(x) # add an integer
d[self.mk('L' + x)] = [x] * 10 # add a list
diff --git a/Lib/bsddb/test/test_get_none.py b/Lib/bsddb/test/test_get_none.py
index 8763b54..541044c 100644
--- a/Lib/bsddb/test/test_get_none.py
+++ b/Lib/bsddb/test/test_get_none.py
@@ -26,14 +26,14 @@
d.open(self.filename, db.DB_BTREE, db.DB_CREATE)
d.set_get_returns_none(1)
- for x in string.letters:
+ for x in string.ascii_letters:
d.put(x, x * 40)
data = d.get('bad key')
self.assertEqual(data, None)
- data = d.get(string.letters[0])
- self.assertEqual(data, string.letters[0]*40)
+ data = d.get(string.ascii_letters[0])
+ self.assertEqual(data, string.ascii_letters[0]*40)
count = 0
c = d.cursor()
@@ -43,7 +43,7 @@
rec = c.next()
self.assertEqual(rec, None)
- self.assertEqual(count, len(string.letters))
+ self.assertEqual(count, len(string.ascii_letters))
c.close()
d.close()
@@ -54,14 +54,14 @@
d.open(self.filename, db.DB_BTREE, db.DB_CREATE)
d.set_get_returns_none(0)
- for x in string.letters:
+ for x in string.ascii_letters:
d.put(x, x * 40)
self.assertRaises(db.DBNotFoundError, d.get, 'bad key')
self.assertRaises(KeyError, d.get, 'bad key')
- data = d.get(string.letters[0])
- self.assertEqual(data, string.letters[0]*40)
+ data = d.get(string.ascii_letters[0])
+ self.assertEqual(data, string.ascii_letters[0]*40)
count = 0
exceptionHappened = 0
@@ -77,7 +77,7 @@
self.assertNotEqual(rec, None)
self.assertTrue(exceptionHappened)
- self.assertEqual(count, len(string.letters))
+ self.assertEqual(count, len(string.ascii_letters))
c.close()
d.close()
diff --git a/Lib/bsddb/test/test_queue.py b/Lib/bsddb/test/test_queue.py
index d3a0c8b..5fa22ee 100644
--- a/Lib/bsddb/test/test_queue.py
+++ b/Lib/bsddb/test/test_queue.py
@@ -10,7 +10,6 @@
#----------------------------------------------------------------------
-@unittest.skip("fails on Windows; see issue 22943")
class SimpleQueueTestCase(unittest.TestCase):
def setUp(self):
self.filename = get_new_database_path()
@@ -37,17 +36,17 @@
print "before appends" + '-' * 30
pprint(d.stat())
- for x in string.letters:
+ for x in string.ascii_letters:
d.append(x * 40)
- self.assertEqual(len(d), len(string.letters))
+ self.assertEqual(len(d), len(string.ascii_letters))
d.put(100, "some more data")
d.put(101, "and some more ")
d.put(75, "out of order")
d.put(1, "replacement data")
- self.assertEqual(len(d), len(string.letters)+3)
+ self.assertEqual(len(d), len(string.ascii_letters)+3)
if verbose:
print "before close" + '-' * 30
@@ -108,17 +107,17 @@
print "before appends" + '-' * 30
pprint(d.stat())
- for x in string.letters:
+ for x in string.ascii_letters:
d.append(x * 40)
- self.assertEqual(len(d), len(string.letters))
+ self.assertEqual(len(d), len(string.ascii_letters))
d.put(100, "some more data")
d.put(101, "and some more ")
d.put(75, "out of order")
d.put(1, "replacement data")
- self.assertEqual(len(d), len(string.letters)+3)
+ self.assertEqual(len(d), len(string.ascii_letters)+3)
if verbose:
print "before close" + '-' * 30
diff --git a/Lib/bsddb/test/test_recno.py b/Lib/bsddb/test/test_recno.py
index fb6956a..b0e30de 100644
--- a/Lib/bsddb/test/test_recno.py
+++ b/Lib/bsddb/test/test_recno.py
@@ -4,12 +4,11 @@
import os, sys
import errno
from pprint import pprint
+import string
import unittest
from test_all import db, test_support, verbose, get_new_environment_path, get_new_database_path
-letters = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
-
#----------------------------------------------------------------------
@@ -39,7 +38,7 @@
d.open(self.filename, db.DB_RECNO, db.DB_CREATE)
- for x in letters:
+ for x in string.ascii_letters:
recno = d.append(x * 60)
self.assertIsInstance(recno, int)
self.assertGreaterEqual(recno, 1)
@@ -270,7 +269,7 @@
d.set_re_pad(45) # ...test both int and char
d.open(self.filename, db.DB_RECNO, db.DB_CREATE)
- for x in letters:
+ for x in string.ascii_letters:
d.append(x * 35) # These will be padded
d.append('.' * 40) # this one will be exact
diff --git a/Misc/NEWS b/Misc/NEWS
index 040b950..4b42d62 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -30,6 +30,11 @@
- Issue #18905: "pydoc -p 0" now outputs actually used port. Based on patch by
Wieland Hoffmann.
+Tests
+-----
+
+- Issue #22943: bsddb tests are locale independend now.
+
What's New in Python 2.7.9?
===========================