diff options
| author | William Deegan <bill@baddogconsulting.com> | 2016-05-19 02:18:14 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2016-05-19 02:18:14 (GMT) |
| commit | 839045dc79c4a02d971bad84265d08474c20d098 (patch) | |
| tree | 96894d5a64a620c38766372b49b47a5bbf07d12f /src | |
| parent | b763362d906af8e23409a1f5d3dc782b0ca3cc91 (diff) | |
| parent | 84f1b6dcfca18d6839cb76fb6eda000a8283734a (diff) | |
| download | SCons-839045dc79c4a02d971bad84265d08474c20d098.zip SCons-839045dc79c4a02d971bad84265d08474c20d098.tar.gz SCons-839045dc79c4a02d971bad84265d08474c20d098.tar.bz2 | |
merge
Diffstat (limited to 'src')
| -rw-r--r-- | src/script/sconsign.py | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/script/sconsign.py b/src/script/sconsign.py index 6f49858..e046a2c 100644 --- a/src/script/sconsign.py +++ b/src/script/sconsign.py @@ -187,7 +187,9 @@ sys.path = libs + sys.path import SCons.compat import whichdb -import dbm + +# was added for py3, but breaks py2 on windows.. +#import dbm import time import pickle import imp @@ -205,8 +207,14 @@ def my_whichdb(filename): pass return _orig_whichdb(filename) + +# Should work on python2 _orig_whichdb = whichdb.whichdb -dbm.whichdb = my_whichdb +whichdb.whichdb = my_whichdb + +# was changed for python3 +#_orig_whichdb = whichdb.whichdb +#dbm.whichdb = my_whichdb def my_import(mname): if '.' in mname: @@ -523,7 +531,9 @@ if Do_Call: Do_Call(a) else: for a in args: - dbm_name = dbm.whichdb(a) + # changed for py3 compat, broke py2 on windows + # dbm_name = dbm.whichdb(a) + dbm_name = whichdb.whichdb(a) if dbm_name: Map_Module = {'SCons.dblite' : 'dblite'} if dbm_name != "SCons.dblite": |