1 files changed, 9 insertions, 27 deletions
diff --git a/src/engine/SCons/Util.py b/src/engine/SCons/Util.py
index d930dde..130cc5e 100644
--- a/src/engine/SCons/Util.py
+++ b/src/engine/SCons/Util.py
@@ -39,18 +39,8 @@ PY3 = sys.version_info[0] == 3
 PYPY = hasattr(sys, 'pypy_translation_info')
 
 
-try:
-    from collections import UserDict, UserList, UserString
-except ImportError:
-    from UserDict import UserDict
-    from UserList import UserList
-    from UserString import UserString
-
-try:
-    from collections.abc import Iterable, MappingView
-except ImportError:
-    from collections import Iterable
-
+from collections import UserDict, UserList, UserString
+from collections.abc import Iterable, MappingView
 from collections import OrderedDict
 
 # Don't "from types import ..." these because we need to get at the
@@ -62,13 +52,6 @@ from collections import OrderedDict
 MethodType      = types.MethodType
 FunctionType    = types.FunctionType
 
-try:
-    _ = type(unicode)
-except NameError:
-    UnicodeType = str
-else:
-    UnicodeType = unicode
-
 def dictify(keys, values, result={}):
     for k, v in zip(keys, values):
         result[k] = v
@@ -210,14 +193,16 @@ def get_environment_var(varstr):
     else:
         return None
 
+
 class DisplayEngine(object):
     print_it = True
+
     def __call__(self, text, append_newline=1):
         if not self.print_it:
             return
         if append_newline: text = text + '\n'
         try:
-            sys.stdout.write(UnicodeType(text))
+            sys.stdout.write(str(text))
         except IOError:
             # Stdout might be connected to a pipe that has been closed
             # by now. The most likely reason for the pipe being closed
@@ -1582,11 +1567,8 @@ del __revision__
 def to_bytes(s):
     if s is None:
         return b'None'
-    if not PY3 and isinstance(s, UnicodeType):
-        # PY2, must encode unicode
-        return bytearray(s, 'utf-8')
-    if isinstance (s, (bytes, bytearray)) or bytes is str:
-        # Above case not covered here as py2 bytes and strings are the same
+    if isinstance(s, (bytes, bytearray)):
+        # if already bytes return.
         return s
     return bytes(s, 'utf-8')
 
@@ -1594,9 +1576,9 @@ def to_bytes(s):
 def to_str(s):
     if s is None:
         return 'None'
-    if bytes is str or is_String(s):
+    if is_String(s):
         return s
-    return str (s, 'utf-8')
+    return str(s, 'utf-8')
 
 
 def cmp(a, b):