[Python-3000-checkins] r66193 - in python/branches/py3k: Lib/bsddb/test/test_all.py Lib/test/test_bsddb3.py Modules/bsddb.h

[jesus.cea]

Author: jesus.cea
Date: Thu Sep 4 00:07:33 2008
New Revision: 66193

Log:
Python3.0 bsddb testsuite compatibility improvements

Modified:
python/branches/py3k/Lib/bsddb/test/test_all.py
python/branches/py3k/Lib/test/test_bsddb3.py
python/branches/py3k/Modules/bsddb.h

Modified: python/branches/py3k/Lib/bsddb/test/test_all.py
==============================================================================
--- python/branches/py3k/Lib/bsddb/test/test_all.py (original)
+++ python/branches/py3k/Lib/bsddb/test/test_all.py Thu Sep 4 00:07:33 2008
@@ -67,6 +67,10 @@
v = self._dbcursor.next_dup()
return self._fix(v)

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

Modified: python/branches/py3k/Lib/test/test_bsddb3.py
==============================================================================
--- python/branches/py3k/Lib/test/test_bsddb3.py (original)
+++ python/branches/py3k/Lib/test/test_bsddb3.py Thu Sep 4 00:07:33 2008
@@ -11,9 +11,6 @@

# When running as a script instead of within the regrtest framework, skip the
# requires test, since it's obvious we want to run them.
-if __name__ != '__main__':
- requires('bsddb')
-
verbose = False
if 'verbose' in sys.argv:
verbose = True
@@ -52,6 +49,10 @@
def test_main():
from bsddb import db
from bsddb.test import test_all
+
+ # This must be improved...
+ test_all.do_proxy_db_py3k(True)
+
test_all.set_test_path_prefix(os.path.join(tempfile.gettempdir(),
'z-test_bsddb3-%s' %
os.getpid()))
@@ -73,6 +74,9 @@
except:
pass

+ # This must be improved...
+ test_all.do_proxy_db_py3k(False)
+

if __name__ == '__main__':
test_main()

Modified: python/branches/py3k/Modules/bsddb.h
==============================================================================
--- python/branches/py3k/Modules/bsddb.h (original)
+++ python/branches/py3k/Modules/bsddb.h Thu Sep 4 00:07:33 2008
@@ -105,7 +105,7 @@
#error "eek! DBVER can't handle minor versions > 9"
#endif

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

/* Python object definitions */