From c0590267c0c9c1cca7fedb4fcfb95ae42d1093b0 Mon Sep 17 00:00:00 2001
From: William Deegan <bill@baddogconsulting.com>
Date: Sun, 26 Feb 2017 14:19:41 -0800
Subject: remove using unicode and just prefix the string with u

---
 src/engine/SCons/UtilTests.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/engine/SCons/UtilTests.py b/src/engine/SCons/UtilTests.py
index 9ebb924..616d419 100644
--- a/src/engine/SCons/UtilTests.py
+++ b/src/engine/SCons/UtilTests.py
@@ -237,7 +237,11 @@ class UtilTestCase(unittest.TestCase):
     def test_is_Dict(self):
         assert is_Dict({})
         assert is_Dict(UserDict())
-        assert is_Dict(os.environ)
+
+        # os.environ is not a dictionary in python 3
+        if sys.version_info < (3,0):
+            assert is_Dict(os.environ)
+
         try:
             class mydict(dict):
                 pass
@@ -723,7 +727,7 @@ class UtilTestCase(unittest.TestCase):
 
     def test_LogicalLines(self):
         """Test the LogicalLines class"""
-        content = r"""
+        content = u"""
 foo \
 bar \
 baz
@@ -732,7 +736,7 @@ bling \
 bling \ bling
 bling
 """
-        fobj = io.StringIO(unicode(content))
+        fobj = io.StringIO(content)
         lines = LogicalLines(fobj).readlines()
         assert lines == [
             '\n',
-- 
cgit v0.12