diff options
| author | William Deegan <bill@baddogconsulting.com> | 2017-03-10 23:28:39 -0500 |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2017-03-10 23:28:39 -0500 |
| commit | 66a3f3ec3c6df0a5e13571be8cb14356f545a680 (patch) | |
| tree | 84f5445098fdd8662380508fa9c65f10176919ef /src/script | |
| parent | 11366ad5debbf75a67f35aebea1dec65ae3e7397 (diff) | |
| download | scons-66a3f3ec3c6df0a5e13571be8cb14356f545a680.tar.gz | |
use whichdb from dbm for py3, and whichdb from whichdb for py2
Diffstat (limited to 'src/script')
| -rw-r--r-- | src/script/sconsign.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/script/sconsign.py b/src/script/sconsign.py index 13fac984..239979fd 100644 --- a/src/script/sconsign.py +++ b/src/script/sconsign.py @@ -186,10 +186,12 @@ sys.path = libs + sys.path import SCons.compat -import whichdb +try: + import whichdb + whichdb = whichdb.whichdb +except ImportError as e: + from dbm import whichdb -# was added for py3, but breaks py2 on windows.. -#import dbm import time import pickle import imp @@ -209,8 +211,8 @@ def my_whichdb(filename): # Should work on python2 -_orig_whichdb = whichdb.whichdb -whichdb.whichdb = my_whichdb +_orig_whichdb = whichdb +whichdb = my_whichdb # was changed for python3 #_orig_whichdb = whichdb.whichdb @@ -531,9 +533,7 @@ if Do_Call: Do_Call(a) else: for a in args: - # changed for py3 compat, broke py2 on windows - # dbm_name = dbm.whichdb(a) - dbm_name = whichdb.whichdb(a) + dbm_name = whichdb(a) if dbm_name: Map_Module = {'SCons.dblite' : 'dblite'} if dbm_name != "SCons.dblite": |