Merge pull request #3815 from mwichmann/more-py2-drops

Drop some more Py2 compat things

Author: bdbaddog

CHANGES.txt

@@ -65,6 +65,7 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
     - Make sure cProfile is used if profiling - SCons was expecting
       the Util module to monkeypatch in cProfile as profile if available,
       but this is no longer being done.
+    - Some Python 2 compatibility code dropped
 
   From Simon Tegelid
     - Fix using TEMPFILE in multiple actions in an action list. Previously a builder, or command

SCons/Node/FS.py

@@ -434,7 +434,7 @@ class EntryProxy(SCons.Util.Proxy):
 
     # In PY3 if a class defines __eq__, then it must explicitly provide
     # __hash__.  Since SCons.Util.Proxy provides __eq__ we need the following
-    # see: https://docs.python.org/3.1/reference/datamodel.html#object.__hash__
+    # see: https://docs.python.org/3/reference/datamodel.html#object.__hash__
     __hash__ = SCons.Util.Delegate('__hash__')
 
     def __get_abspath(self):

SCons/Node/Python.py

@@ -129,7 +129,7 @@ def read(self):
             self.built_value = self.value
         return self.built_value
 
-    def get_text_contents(self):
+    def get_text_contents(self) -> str:
         """By the assumption that the node.built_value is a
         deterministic product of the sources, the contents of a Value
         are the concatenation of all the contents of its sources.  As
@@ -141,24 +141,16 @@ def get_text_contents(self):
             contents = contents + kid.get_contents().decode()
         return contents
 
-    def get_contents(self):
-        """
-        Get contents for signature calculations.
-        :return: bytes
-        """
-        text_contents = self.get_text_contents()
-        try:
-            return text_contents.encode()
-        except UnicodeDecodeError:
-            # Already encoded as python2 str are bytes
-            return text_contents
+    def get_contents(self) -> bytes:
+        """Get contents for signature calculations."""
+        return self.get_text_contents().encode()
 
     def changed_since_last_build(self, target, prev_ni):
         cur_csig = self.get_csig()
         try:
             return cur_csig != prev_ni.csig
         except AttributeError:
-            return 1
+            return True
 
     def get_csig(self, calc=None):
         """Because we're a Python value node and don't have a real

SCons/Script/__init__.py

@@ -36,11 +36,7 @@
 
 import collections
 import os
-
-try:
-    from StringIO import StringIO
-except ImportError:
-    from io import StringIO
+from io import StringIO
 
 import sys
 

SCons/SubstTests.py

@@ -541,9 +541,7 @@ def test_subst_syntax_errors(self):
             scons_subst('$foo.bar.3.0', env)
         except SCons.Errors.UserError as e:
             expect = [
-                # Python 2.3, 2.4
-                "SyntaxError `invalid syntax (line 1)' trying to evaluate `$foo.bar.3.0'",
-                # Python 2.5
+                # Python 2.5 and later
                 "SyntaxError `invalid syntax (<string>, line 1)' trying to evaluate `$foo.bar.3.0'",
             ]
             assert str(e) in expect, e

SCons/Tool/clang.py

@@ -84,8 +84,7 @@ def generate(env):
         # clang -dumpversion is of no use
         with pipe.stdout:
             line = pipe.stdout.readline()
-        if sys.version_info[0] > 2:
-            line = line.decode()
+        line = line.decode()
         match = re.search(r'clang +version +([0-9]+(?:\.[0-9]+)+)', line)
         if match:
             env['CCVERSION'] = match.group(1)

SCons/Tool/clangxx.py

@@ -92,8 +92,7 @@ def generate(env):
         # clang -dumpversion is of no use
         with pipe.stdout:
             line = pipe.stdout.readline()
-        if sys.version_info[0] > 2:
-            line = line.decode()
+        line = line.decode()
         match = re.search(r'clang +version +([0-9]+(?:\.[0-9]+)+)', line)
         if match:
             env['CXXVERSION'] = match.group(1)

SCons/Tool/textfile.py

@@ -74,8 +74,8 @@ def _do_subst(node, subs):
     if 'b' in TEXTFILE_FILE_WRITE_MODE:
         try:
             contents = bytearray(contents, 'utf-8')
-        except UnicodeDecodeError:
-            # contents is already utf-8 encoded python 2 str i.e. a byte array
+        except TypeError:
+            # TODO: this should not happen, get_text_contents returns text
             contents = bytearray(contents)
 
     return contents

SCons/UtilTests.py

@@ -193,11 +193,7 @@ def get_children(node):
         try:
             node, expect, withtags = self.tree_case_1()
 
-            if sys.version_info.major < 3:
-                IOStream = io.BytesIO
-            else:
-                IOStream = io.StringIO
-
+            IOStream = io.StringIO
             sys.stdout = IOStream()
             print_tree(node, get_children)
             actual = sys.stdout.getvalue()
@@ -249,11 +245,6 @@ def get_children(node):
     def test_is_Dict(self):
         assert is_Dict({})
         assert is_Dict(UserDict())
-
-        # 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

SCons/Utilities/sconsign.py

@@ -98,11 +98,6 @@ def default_mapper(entry, name):
         val = eval("entry." + name)
     except AttributeError:
         val = None
-    if sys.version_info.major >= 3 and isinstance(val, bytes):
-        # This is a dirty hack for py 2/3 compatibility. csig is a bytes object
-        # in Python3 while Python2 bytes are str. Hence, we decode the csig to a
-        # Python3 string
-        val = val.decode()
     return str(val)
 
 
@@ -327,8 +322,8 @@ def __call__(self, fname):
             sys.stderr.write("sconsign: ignoring invalid `%s' file `%s': %s\n"
                              % (self.dbm_name, fname, e))
             exc_type, _, _ = sys.exc_info()
-            if exc_type.__name__ == "ValueError" and sys.version_info < (3,0,0):
-                sys.stderr.write("Python 2 only supports pickle protocols 0-2.\n")
+            if exc_type.__name__ == "ValueError":
+                sys.stderr.write("unrecognized pickle protocol.\n")
             return
 
         if Print_Directories: