From: Martin v. Löwis <martin@v.loewis.de>
Date: Tue, 19 Nov 2002 17:48:49 +0000 (+0000)
Subject: Replace bsddb3 and _db occurrences.
X-Git-Tag: v2.3c1~3356
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7a3bae410df3dd0032509b97077d0c4d98276fdd;p=thirdparty%2FPython%2Fcpython.git

Replace bsddb3 and _db occurrences.
---

diff --git a/Lib/bsddb/db.py b/Lib/bsddb/db.py
index b4365d06d9f2..c1749dfa0786 100644
--- 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 ce4a466cef5a..ab6363649abd 100644
--- 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 4e934513ca73..f1e88f23831c 100644
--- 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