From: Skip Montanaro <skip@pobox.com>
Date: Thu, 25 Jan 2001 13:47:00 +0000 (+0000)
Subject: fail more completely by deleting dbhash from sys.modules if bsddb can't be
X-Git-Tag: v2.1a2~190
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=438bb947893e92455decfaadd739034fe26e192a;p=python

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
---

diff --git a/Lib/dbhash.py b/Lib/dbhash.py
index 4abd4f03f1..ad94ed8efa 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"]