Merged revisions 85645 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85645 | matthias.klose | 2010-10-17 15:22:33 +0200 (Sun, 17 Oct 2010) | 2 lines

  - Accept Oracle Berkeley DB 5.0 and 5.1 as backend for the dbm extension.
........

diff --git a/Misc/NEWS b/Misc/NEWS
index 7cd457c76527aaafd055723d18b4512d179e6183..b670c643e3aeaf0680ae09c59bc9a9b1fe38c878 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -54,6 +54,8 @@ Build
 
 - Stop packaging versioncheck tool (already done for rc1).
 
+- Accept Oracle Berkeley DB 4.8, 5.0 and 5.1 as backend for the dbm extension.
+
 Tests
 -----
 

diff --git a/setup.py b/setup.py
index 2eb4b8549b2ce1c58064f4e03901ab449761fecb..b2f91ef02de5cd33fc5b54662744475c7afec723 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -729,7 +729,7 @@ class PyBuildExt(build_ext):
         # a release.  Most open source OSes come with one or more
         # versions of BerkeleyDB already installed.
 
-        max_db_ver = (4, 7)
+        max_db_ver = (5, 1)
         min_db_ver = (3, 3)
         db_setup_debug = False   # verbose debug prints from this script?