[Python-checkins] r86796 - in python/branches/release31-maint: Misc/NEWS setup.py

[matthias.klose]

Author: matthias.klose
Date: Fri Nov 26 12:56:26 2010
New Revision: 86796

Log:
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.
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Misc/NEWS
   python/branches/release31-maint/setup.py

Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Fri Nov 26 12:56:26 2010
@@ -54,6 +54,8 @@
 
 - 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
 -----
 

Modified: python/branches/release31-maint/setup.py
==============================================================================
--- python/branches/release31-maint/setup.py	(original)
+++ python/branches/release31-maint/setup.py	Fri Nov 26 12:56:26 2010
@@ -729,7 +729,7 @@
         # 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?