diff options
author | Greg Noel <GregNoel@tigris.org> | 2010-04-25 07:10:15 (GMT) |
---|---|---|
committer | Greg Noel <GregNoel@tigris.org> | 2010-04-25 07:10:15 (GMT) |
commit | 186b632fd20283e821b6a65c72772635017945fb (patch) | |
tree | 3863a0df57143ab053895e2719d7b1d96ce4821c /src/script | |
parent | 1c13a030e39109c5343046d0d555f48b7cc61126 (diff) | |
download | SCons-186b632fd20283e821b6a65c72772635017945fb.zip SCons-186b632fd20283e821b6a65c72772635017945fb.tar.gz SCons-186b632fd20283e821b6a65c72772635017945fb.tar.bz2 |
Fix regression tests (imports not happening as expected)
Diffstat (limited to 'src/script')
-rw-r--r-- | src/script/sconsign.py | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/script/sconsign.py b/src/script/sconsign.py index 759c5ad..075459f 100644 --- a/src/script/sconsign.py +++ b/src/script/sconsign.py @@ -36,7 +36,6 @@ __date__ = "__DATE__" __developer__ = "__DEVELOPER__" import os -import os.path import sys import time @@ -170,16 +169,14 @@ sys.path = libs + sys.path # END STANDARD SCons SCRIPT HEADER ############################################################################## -import SCons.compat +import SCons.compat # so pickle will import cPickle instead -import dbm -import imp +import whichdb import pickle +import imp import SCons.SConsign -# Monkey-patch in a whichdb()-like function so any use of dbm.whichdb() -# can detect our internal .dblite format, def my_whichdb(filename): if filename[-7:] == ".dblite": return "SCons.dblite" @@ -191,8 +188,8 @@ def my_whichdb(filename): pass return _orig_whichdb(filename) -_orig_whichdb = dbm.whichdb -dbm.whichdb = my_whichdb +_orig_whichdb = whichdb.whichdb +whichdb.whichdb = my_whichdb def my_import(mname): if '.' in mname: @@ -499,7 +496,7 @@ if Do_Call: Do_Call(a) else: for a in args: - dbm_name = dbm.whichdb(a) + dbm_name = whichdb.whichdb(a) if dbm_name: Map_Module = {'SCons.dblite' : 'dblite'} dbm = my_import(dbm_name) |