summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorSkip Montanaro <skip@pobox.com>2001-01-25 13:47:00 (GMT)
committerSkip Montanaro <skip@pobox.com>2001-01-25 13:47:00 (GMT)
commit438bb947893e92455decfaadd739034fe26e192a (patch)
treea0c6a0090ef5ff1b93d03755e03a883045fc65bf /Lib
parent82e00d63506dd024098dda75114cb7839c6d92c6 (diff)
downloadcpython-438bb947893e92455decfaadd739034fe26e192a.zip
cpython-438bb947893e92455decfaadd739034fe26e192a.tar.gz
cpython-438bb947893e92455decfaadd739034fe26e192a.tar.bz2
fail more completely by deleting dbhash from sys.modules if bsddb can't be
loaded - prevents second import later from succeeding spuriously - mostly of use in regression tests where the module might get imported more than once
Diffstat (limited to 'Lib')
-rw-r--r--Lib/dbhash.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/Lib/dbhash.py b/Lib/dbhash.py
index 4abd4f0..ad94ed8 100644
--- a/Lib/dbhash.py
+++ b/Lib/dbhash.py
@@ -1,6 +1,12 @@
"""Provide a (g)dbm-compatible interface to bsdhash.hashopen."""
-import bsddb
+import sys
+try:
+ import bsddb
+except ImportError:
+ # prevent a second import of this module from spuriously succeeding
+ del sys.modules[__name__]
+ raise
__all__ = ["error","open"]