Replace bsddb3 and _db occurrences.

diff --git a/Lib/bsddb/db.py b/Lib/bsddb/db.py
index b4365d06d9f22ab6d5b889e425beeb49af07c4a5..c1749dfa0786ba771ede3c6d7adb242402f5bb8c 100644 (file)
--- a/Lib/bsddb/db.py
+++ b/Lib/bsddb/db.py
@@ -37,8 +37,8 @@
 # case we ever want to augment the stuff in _db in any way.  For now
 # it just simply imports everything from _db.
 
-from _db import *
-from _db import __version__
+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?"

diff --git a/Lib/bsddb/dbshelve.py b/Lib/bsddb/dbshelve.py
index ce4a466cef5ad97ddd962bd167cb565caf26eef7..ab6363649abd2f0a2f58a7f417d734921cf04709 100644 (file)
--- a/Lib/bsddb/dbshelve.py
+++ b/Lib/bsddb/dbshelve.py
@@ -31,7 +31,7 @@ storage.
 #------------------------------------------------------------------------
 
 import cPickle
-from bsddb3 import db
+from bsddb import db
 
 #------------------------------------------------------------------------
 

diff --git a/Lib/bsddb/dbtables.py b/Lib/bsddb/dbtables.py
index 4e934513ca73b120f798812f1a55d830f905815c..f1e88f23831c63a6e17f4030f064900818ebbd7b 100644 (file)
--- a/Lib/bsddb/dbtables.py
+++ b/Lib/bsddb/dbtables.py
@@ -28,7 +28,7 @@ import xdrlib
 import re
 import copy
 
-from bsddb3.db import *
+from bsddb.db import *
 
 
 class TableDBError(StandardError): pass