From b845ef056ac33e2d65556cb7924d2084f89d2e0c Mon Sep 17 00:00:00 2001
From: "Gregory P. Smith" <greg@mad-scientist.com>
Date: Thu, 13 Nov 2003 08:30:03 +0000
Subject: [PATCH] remove "support" for BerkeleyDB 3.1, it hasn't worked for a
 long time

---
 Doc/lib/libbsddb.tex |  4 ++--
 setup.py             | 10 ++--------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/Doc/lib/libbsddb.tex b/Doc/lib/libbsddb.tex
index 88398a97517..f625dabc8f3 100644
--- a/Doc/lib/libbsddb.tex
+++ b/Doc/lib/libbsddb.tex
@@ -15,8 +15,8 @@ other objects as keys or to store other kinds of objects the user must
 serialize them somehow, typically using marshal.dumps or pickle.dumps.
 
 Starting with Python 2.3 the \module{bsddb} module requires the
-Berkeley DB library version 3.1 or later (it is known to work with 3.1
-thru 4.1 at the time of this writing).
+Berkeley DB library version 3.2 or later (it is known to work with 3.2
+thru 4.2 at the time of this writing).
 
 \begin{seealso}
   \seeurl{http://pybsddb.sourceforge.net/}{Website with documentation
diff --git a/setup.py b/setup.py
index aef22ec7fef..43c2c281584 100644
--- a/setup.py
+++ b/setup.py
@@ -470,14 +470,10 @@ class PyBuildExt(build_ext):
         # Sleepycat Berkeley DB interface.  http://www.sleepycat.com
         #
         # This requires the Sleepycat DB code. The earliest supported version
-        # of that library is 3.1, the latest supported version is 4.2.  A list
+        # of that library is 3.2, the latest supported version is 4.2.  A list
         # of available releases can be found at
         #
         # http://www.sleepycat.com/update/index.html
-        #
-        # NOTE: 3.1 is only partially supported; expect the extended bsddb module
-        # test suite to show failures due to some missing methods and behaviours
-        # in BerkeleyDB 3.1.
 
         # when sorted in reverse order, keys for this dict must appear in the
         # order you wish to search - e.g., search for db4 before db3
@@ -500,17 +496,15 @@ class PyBuildExt(build_ext):
                                 '/sw/include/db4',
                                 '/usr/include/db4',
                                 )},
-            'db3': {'libs': ('db-3.3', 'db-3.2', 'db-3.1', 'db3',),
+            'db3': {'libs': ('db-3.3', 'db-3.2', 'db3',),
                     'libdirs': ('/usr/local/BerkeleyDB.3.3/lib',
                                 '/usr/local/BerkeleyDB.3.2/lib',
-                                '/usr/local/BerkeleyDB.3.1/lib',
                                 '/usr/local/lib',
                                 '/opt/sfw/lib',
                                 '/sw/lib',
                                 ),
                     'incdirs': ('/usr/local/BerkeleyDB.3.3/include',
                                 '/usr/local/BerkeleyDB.3.2/include',
-                                '/usr/local/BerkeleyDB.3.1/include',
                                 '/usr/local/include/db3',
                                 '/opt/sfw/include/db3',
                                 '/sw/include/db3',