simplify some import statements and clean up a docstring and BerkeleyDB library

version check to mention that we support versions 3.2 - 4.2.

diff --git a/Lib/bsddb/__init__.py b/Lib/bsddb/__init__.py
index 6b4f96518802b68c8106fec4b3d96d123bacf79a..f525a17e185ecc22bcbaa1f5cc068c98becc4fd0 100644 (file)
--- a/Lib/bsddb/__init__.py
+++ b/Lib/bsddb/__init__.py
@@ -33,7 +33,7 @@
 #----------------------------------------------------------------------
 
 
-"""Support for BerkeleyDB 3.1 through 4.1.
+"""Support for BerkeleyDB 3.2 through 4.2.
 """
 
 try:

diff --git a/Lib/bsddb/db.py b/Lib/bsddb/db.py
index c1749dfa0786ba771ede3c6d7adb242402f5bb8c..e6f1bb261c513b24cfeed4c38a160f0cb8f5760e 100644 (file)
--- a/Lib/bsddb/db.py
+++ b/Lib/bsddb/db.py
@@ -40,5 +40,5 @@
 from _bsddb import *
 from _bsddb import __version__
 
-if version() < (3, 1, 0):
-    raise ImportError, "BerkeleyDB 3.x symbols not found.  Perhaps python was statically linked with an older version?"
+if version() < (3, 2, 0):
+    raise ImportError, "correct BerkeleyDB symbols not found.  Perhaps python was statically linked with an older version?"

diff --git a/Lib/bsddb/dbshelve.py b/Lib/bsddb/dbshelve.py
index fe4c4d197fb06f0686adf1b707e29b0092a1d1f1..003038ba56e6ead349936f83bf8fde1328b96652 100644 (file)
--- a/Lib/bsddb/dbshelve.py
+++ b/Lib/bsddb/dbshelve.py
@@ -35,12 +35,7 @@ try:
 except ImportError:
     # DictMixin is new in Python 2.3
     class DictMixin: pass
-try:
-    # For Python 2.3
-    from bsddb import db
-except ImportError:
-    # For earlier Pythons w/distutils pybsddb
-    from bsddb3 import db
+import db
 
 #------------------------------------------------------------------------
 

diff --git a/Lib/bsddb/dbutils.py b/Lib/bsddb/dbutils.py
index 3568b44a82b09f28d3425053bc7426ff199ffa66..3f6384279f3dab41c7cf293909558485b1b9270b 100644 (file)
--- a/Lib/bsddb/dbutils.py
+++ b/Lib/bsddb/dbutils.py
@@ -26,12 +26,7 @@
 #
 from time import sleep as _sleep
 
-try:
-    # For Python 2.3
-    from bsddb import db
-except ImportError:
-    # For earlier Pythons w/distutils pybsddb
-    from bsddb3 import db
+import db
 
 # always sleep at least N seconds between retrys
 _deadlock_MinSleepTime = 1.0/64