[PR 3462] convert json cache better way for py2

there was still a path through without fully converted data,
where env['ENV'] could contain unicode, so convert the cache hit instead.
This is a little slower but only for Py2 which is going away anyway.

added the vs2019 exec test (vs-14.2-exec) which is just a copy
of 14.0, 14.1 with the required version changed - this had
never been added.

Signed-off-by: Mats Wichmann <mats@linux.com>

2 files changed, 19 insertions, 18 deletions

diff --git a/src/engine/SCons/Tool/MSCommon/common.py b/src/engine/SCons/Tool/MSCommon/common.py
index eaf57f9..ad371e9 100644
--- a/src/engine/SCons/Tool/MSCommon/common.py
+++ b/src/engine/SCons/Tool/MSCommon/common.py
@@ -30,7 +30,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 import copy
 import json
 import os
-import subprocess
 import re
 import subprocess
 import sys
@@ -58,23 +57,13 @@ CONFIG_CACHE = os.environ.get('SCONS_CACHE_MSVC_CONFIG')
 if CONFIG_CACHE in ('1', 'true', 'True'):
     CONFIG_CACHE = os.path.join(os.path.expanduser('~'), '.scons_msvc_cache')
 
-# !@$#@$? Python2
-if sys.version_info[0] == 2:
-    def str_hook(obj):
-        return {k.encode('utf-8') if isinstance(k, unicode) else k :
-                v.encode('utf-8') if isinstance(v, unicode) else v
-                for k,v in obj}
-
 def read_script_env_cache():
     """ fetch cached msvc env vars if requested, else return empty dict """
     envcache = {}
     if CONFIG_CACHE:
         try:
             with open(CONFIG_CACHE, 'r') as f:
-                if sys.version_info[0] == 2:
-                    envcache = json.load(f, object_pairs_hook=str_hook)
-                else:
-                    envcache = json.load(f)
+                envcache = json.load(f)
         #TODO can use more specific FileNotFoundError when py2 dropped
         except IOError:
             pass
@@ -244,7 +233,6 @@ def get_output(vcbat, args = None, env = None):
     if stderr:
         # TODO: find something better to do with stderr;
         # this at least prevents errors from getting swallowed.
-        import sys
         sys.stderr.write(stderr)
     if popen.wait() != 0:
         raise IOError(stderr.decode("mbcs"))
diff --git a/src/engine/SCons/Tool/MSCommon/vc.py b/src/engine/SCons/Tool/MSCommon/vc.py
index 019d608..d321f43 100644
--- a/src/engine/SCons/Tool/MSCommon/vc.py
+++ b/src/engine/SCons/Tool/MSCommon/vc.py
@@ -40,7 +40,10 @@ import SCons.Util
 import subprocess
 import os
 import platform
+import sys
 from string import digits as string_digits
+if sys.version_info[0] == 2:
+    import collections
 
 import SCons.Warnings
 from SCons.Tool import find_program_path
@@ -157,11 +160,6 @@ def get_host_target(env):
     host_platform = env.get('HOST_ARCH')
     if not host_platform:
         host_platform = platform.machine()
-        # TODO(2.5):  the native Python platform.machine() function returns
-        # '' on all Python versions before 2.6, after which it also uses
-        # PROCESSOR_ARCHITECTURE.
-        if not host_platform:
-            host_platform = os.environ.get('PROCESSOR_ARCHITECTURE', '')
 
     # Retain user requested TARGET_ARCH
     req_target_platform = env.get('TARGET_ARCH')
@@ -622,6 +620,21 @@ def script_env(script, args=None):
         script_env_cache[cache_key] = cache_data
         # once we updated cache, give a chance to write out if user wanted
         common.write_script_env_cache(script_env_cache)
+    else:
+        # if we "hit" data from the json file, we have a Py2 problem:
+        # keys & values will be unicode. don't detect, just convert.
+        if sys.version_info[0] == 2:
+            def convert(data):
+                if isinstance(data, basestring):
+                    return str(data)
+                elif isinstance(data, collections.Mapping):
+                    return dict(map(convert, data.iteritems()))
+                elif isinstance(data, collections.Iterable):
+                    return type(data)(map(convert, data))
+                else:
+                    return data
+
+            cache_data = convert(cache_data)
     return cache_data
 
 def get_default_version(env):