diff options
| author | William Deegan <bill@baddogconsulting.com> | 2017-08-24 17:16:58 +0000 |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2017-08-24 17:16:58 +0000 |
| commit | 40ad766db88a95ca1826e980689bbb9da9fee248 (patch) | |
| tree | d5a657ccbedeed832c974f45f86914d7db94dffd | |
| parent | 84f14518cefda575fde05dcd06e68b487c3c11d2 (diff) | |
| parent | 6cfdf207f27c20c15df7cc7c5a23eaaa65be15a1 (diff) | |
| download | scons-40ad766db88a95ca1826e980689bbb9da9fee248.tar.gz | |
Merged in bdbaddog/scons (pull request #505)
Fix handling of non ascii/not utf-8 file contents for PY3 in get_text_contents()
| -rw-r--r-- | src/engine/SCons/Tool/MSCommon/vc.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/engine/SCons/Tool/MSCommon/vc.py b/src/engine/SCons/Tool/MSCommon/vc.py index 7c9eab55..53bd3977 100644 --- a/src/engine/SCons/Tool/MSCommon/vc.py +++ b/src/engine/SCons/Tool/MSCommon/vc.py @@ -245,7 +245,9 @@ def find_vc_pdir_vswhere(msvc_version): if os.path.exists(vswhere_path): sp = subprocess.Popen(vswhere_cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) vsdir, err = sp.communicate() - vc_pdir = os.path.join(vsdir.rstrip(), 'VC') + vsdir = vsdir.decode("mbcs") + vsdir = vsdir.rstrip() + vc_pdir = os.path.join(vsdir, 'VC') return vc_pdir else: # No vswhere on system, no install info available |