From 30394eb96f38142120beb4548918be4d5193f71e Mon Sep 17 00:00:00 2001
From: William Deegan <bill@baddogconsulting.com>
Date: Mon, 17 Feb 2020 16:52:47 -0800
Subject: more unicode cleanup

---
 src/engine/SCons/Platform/win32.py    |  3 ---
 src/engine/SCons/SConfTests.py        | 10 +---------
 src/engine/SCons/Scanner/ProgTests.py | 17 +----------------
 3 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/src/engine/SCons/Platform/win32.py b/src/engine/SCons/Platform/win32.py
index bb1b46d..3258dfd 100644
--- a/src/engine/SCons/Platform/win32.py
+++ b/src/engine/SCons/Platform/win32.py
@@ -307,9 +307,6 @@ def get_system_root():
             except:
                 pass
 
-    # Ensure system root is a string and not unicode 
-    # (This only matters for py27 were unicode in env passed to POpen fails)
-    val = str(val)
     _system_root = val
     return val
 
diff --git a/src/engine/SCons/SConfTests.py b/src/engine/SCons/SConfTests.py
index 40cd69d..63ec8f1 100644
--- a/src/engine/SCons/SConfTests.py
+++ b/src/engine/SCons/SConfTests.py
@@ -307,10 +307,6 @@ int main(void) {
             return None
         def actionFAIL(target, source, env):
             return 1
-        def actionUnicode(target, source, env):
-            with open(str(target[0]), "wb") as f:
-                f.write('2\302\242\n')
-            return None
 
 
         self._resetSConfState()
@@ -319,14 +315,10 @@ int main(void) {
                                   log_file=self.test.workpath('config.log'))
         try:
             (ret, output) = sconf.TryAction(action=actionOK)
-            assert ret and output.encode('utf-8') == bytearray("RUN OK"+os.linesep,'utf-8'), (ret, output)
+            assert ret and output.encode('utf-8') == bytearray("RUN OK"+os.linesep, 'utf-8'), (ret, output)
             (ret, output) = sconf.TryAction(action=actionFAIL)
             assert not ret and output == "", (ret, output)
 
-            if not TestCmd.IS_PY3:
-                # GH Issue #3141 - unicode text and py2.7 crashes.
-                (ret, output) = sconf.TryAction(action=actionUnicode)
-                assert ret and output == u'2\xa2\n', (ret, output)
 
         finally:
             sconf.Finish()
diff --git a/src/engine/SCons/Scanner/ProgTests.py b/src/engine/SCons/Scanner/ProgTests.py
index 45fdcb2..8981fd4 100644
--- a/src/engine/SCons/Scanner/ProgTests.py
+++ b/src/engine/SCons/Scanner/ProgTests.py
@@ -43,6 +43,7 @@ libs = [ 'l1.lib', 'd1/l2.lib', 'd1/d2/l3.lib',
 for h in libs:
     test.write(h, "\n")
 
+
 # define some helpers:
 
 class DummyEnvironment(object):
@@ -254,22 +255,6 @@ def suite():
     suite.addTest(ProgramScannerTestCase8())
     suite.addTest(ProgramScannerTestCase9())
     suite.addTest(ProgramScannerTestCase10())
-    try: unicode
-    except NameError: pass
-    else:
-        code = """if 1:
-            class ProgramScannerTestCase4(unittest.TestCase):
-                def runTest(self):
-                    env = DummyEnvironment(LIBPATH=[test.workpath("d1/d2"),
-                                                    test.workpath("d1")],
-                                           LIBS=u'l2 l3'.split())
-                    s = SCons.Scanner.Prog.ProgramScanner()
-                    path = s.path(env)
-                    deps = s(DummyNode('dummy'), env, path)
-                    assert deps_match(deps, ['d1/l2.lib', 'd1/d2/l3.lib']), map(str, deps)
-            suite.addTest(ProgramScannerTestCase4())
-            \n"""
-        exec(code)
     return suite
 
 if __name__ == "__main__":
-- 
cgit v0.12