Skip to content

Commit a64072f

Browse files
committed
Python3.0 bsddb testsuite compatibility improvements
1 parent 2ab3444 commit a64072f

File tree

3 files changed

+12
-4
lines changed

3 files changed

+12
-4
lines changed

Lib/bsddb/test/test_all.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,10 @@ def next_dup(self) :
6767
v = self._dbcursor.next_dup()
6868
return self._fix(v)
6969

70+
def next_nodup(self) :
71+
v = self._dbcursor.next_nodup()
72+
return self._fix(v)
73+
7074
def put(self, key, value, flags=0, dlen=-1, doff=-1) :
7175
if isinstance(key, str) :
7276
key = bytes(key, charset)

Lib/test/test_bsddb3.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@
1111

1212
# When running as a script instead of within the regrtest framework, skip the
1313
# requires test, since it's obvious we want to run them.
14-
if __name__ != '__main__':
15-
requires('bsddb')
16-
1714
verbose = False
1815
if 'verbose' in sys.argv:
1916
verbose = True
@@ -52,6 +49,10 @@ def testCheckElapsedTime(self):
5249
def test_main():
5350
from bsddb import db
5451
from bsddb.test import test_all
52+
53+
# This must be improved...
54+
test_all.do_proxy_db_py3k(True)
55+
5556
test_all.set_test_path_prefix(os.path.join(tempfile.gettempdir(),
5657
'z-test_bsddb3-%s' %
5758
os.getpid()))
@@ -73,6 +74,9 @@ def test_main():
7374
except:
7475
pass
7576

77+
# This must be improved...
78+
test_all.do_proxy_db_py3k(False)
79+
7680

7781
if __name__ == '__main__':
7882
test_main()

Modules/bsddb.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
#error "eek! DBVER can't handle minor versions > 9"
106106
#endif
107107

108-
#define PY_BSDDB_VERSION "4.7.3pre4"
108+
#define PY_BSDDB_VERSION "4.7.3pre5"
109109

110110
/* Python object definitions */
111111

0 commit comments

Comments
 (0)