Remove support for Python 2

README.md

@@ -30,28 +30,22 @@ Depending on your operating system, you will need to install:
 
 ### On Unix
 
-   * Python v2.7, v3.5, v3.6, v3.7, or v3.8
+   * Python v3.5, v3.6, v3.7, v3.8, or v3.9
    * `make`
    * A proper C/C++ compiler toolchain, like [GCC](https://gcc.gnu.org)
 
 ### On macOS
 
 **ATTENTION**: If your Mac has been _upgraded_ to macOS Catalina (10.15), please read [macOS_Catalina.md](macOS_Catalina.md).
 
-   * Python v2.7, v3.5, v3.6, v3.7, or v3.8
+   * Python v3.5, v3.6, v3.7, v3.8, or v3.9
    * [Xcode](https://developer.apple.com/xcode/download/)
      * You also need to install the `XCode Command Line Tools` by running `xcode-select --install`. Alternatively, if you already have the full Xcode installed, you can find them under the menu `Xcode -> Open Developer Tool -> More Developer Tools...`. This step will install `clang`, `clang++`, and `make`.
 
 ### On Windows
 
 Install the current version of Python from the [Microsoft Store package](https://docs.python.org/3/using/windows.html#the-microsoft-store-package).
 
-#### Option 1
-
-Install all the required tools and configurations using Microsoft's [windows-build-tools](https://github.com/felixrieseberg/windows-build-tools) using `npm install --global windows-build-tools` from an elevated PowerShell or CMD.exe (run as Administrator).
-
-#### Option 2
-
 Install tools and configuration manually:
    * Install Visual C++ Build Environment: [Visual Studio Build Tools](https://visualstudio.microsoft.com/thank-you-downloading-visual-studio/?sku=BuildTools)
    (using "Visual C++ build tools" workload) or [Visual Studio 2017 Community](https://visualstudio.microsoft.com/pl/thank-you-downloading-visual-studio/?sku=Community)
@@ -64,8 +58,8 @@ Install tools and configuration manually:
 
 ### Configuring Python Dependency
 
-`node-gyp` requires that you have installed a compatible version of Python, one of: v2.7, v3.5, v3.6,
-v3.7, or v3.8. If you have multiple Python versions installed, you can identify which Python
+`node-gyp` requires that you have installed a compatible version of Python, one of: v3.5, v3.6,
+v3.7, v3.8, or v3.9. If you have multiple Python versions installed, you can identify which Python
 version `node-gyp` should use in one of the following ways:
 
 1. by setting the `--python` command-line option, e.g.:

gyp/pylib/gyp/MSVSNew.py

@@ -69,7 +69,7 @@ def MakeGuid(name, seed="msvs_new"):
 # ------------------------------------------------------------------------------
 
 
-class MSVSSolutionEntry(object):
+class MSVSSolutionEntry:
     def __cmp__(self, other):
         # Sort by name then guid (so things are in order on vs2008).
         return cmp((self.name, self.get_guid()), (other.name, other.get_guid()))
@@ -190,7 +190,7 @@ def set_msbuild_toolset(self, msbuild_toolset):
 # ------------------------------------------------------------------------------
 
 
-class MSVSSolution(object):
+class MSVSSolution:
     """Visual Studio solution."""
 
     def __init__(
@@ -292,14 +292,14 @@ def Write(self, writer=gyp.common.WriteOnDiff):
                 if e.items:
                     f.write("\tProjectSection(SolutionItems) = preProject\r\n")
                     for i in e.items:
-                        f.write("\t\t%s = %s\r\n" % (i, i))
+                        f.write(f"\t\t{i} = {i}\r\n")
                     f.write("\tEndProjectSection\r\n")
 
             if isinstance(e, MSVSProject):
                 if e.dependencies:
                     f.write("\tProjectSection(ProjectDependencies) = postProject\r\n")
                     for d in e.dependencies:
-                        f.write("\t\t%s = %s\r\n" % (d.get_guid(), d.get_guid()))
+                        f.write(f"\t\t{d.get_guid()} = {d.get_guid()}\r\n")
                     f.write("\tEndProjectSection\r\n")
 
             f.write("EndProject\r\n")
@@ -310,7 +310,7 @@ def Write(self, writer=gyp.common.WriteOnDiff):
         # Configurations (variants)
         f.write("\tGlobalSection(SolutionConfigurationPlatforms) = preSolution\r\n")
         for v in self.variants:
-            f.write("\t\t%s = %s\r\n" % (v, v))
+            f.write(f"\t\t{v} = {v}\r\n")
         f.write("\tEndGlobalSection\r\n")
 
         # Sort config guids for easier diffing of solution changes.
@@ -362,7 +362,7 @@ def Write(self, writer=gyp.common.WriteOnDiff):
                 if not isinstance(e, MSVSFolder):
                     continue  # Does not apply to projects, only folders
                 for subentry in e.entries:
-                    f.write("\t\t%s = %s\r\n" % (subentry.get_guid(), e.get_guid()))
+                    f.write(f"\t\t{subentry.get_guid()} = {e.get_guid()}\r\n")
             f.write("\tEndGlobalSection\r\n")
 
         f.write("EndGlobal\r\n")

gyp/pylib/gyp/MSVSProject.py

@@ -9,7 +9,7 @@
 # ------------------------------------------------------------------------------
 
 
-class Tool(object):
+class Tool:
     """Visual Studio tool."""
 
     def __init__(self, name, attrs=None):
@@ -31,7 +31,7 @@ def _GetSpecification(self):
         return ["Tool", self._attrs]
 
 
-class Filter(object):
+class Filter:
     """Visual Studio filter - that is, a virtual folder."""
 
     def __init__(self, name, contents=None):
@@ -48,7 +48,7 @@ def __init__(self, name, contents=None):
 # ------------------------------------------------------------------------------
 
 
-class Writer(object):
+class Writer:
     """Visual Studio XML project writer."""
 
     def __init__(self, project_path, version, name, guid=None, platforms=None):

gyp/pylib/gyp/MSVSSettings.py

@@ -14,7 +14,6 @@
 MSBuild install directory, e.g. c:\Program Files (x86)\MSBuild
 """
 
-from __future__ import print_function
 
 from gyp import string_types
 
@@ -36,7 +35,7 @@
 _msbuild_name_of_tool = {}
 
 
-class _Tool(object):
+class _Tool:
     """Represents a tool used by MSVS or MSBuild.
 
   Attributes:
@@ -68,7 +67,7 @@ def _GetMSBuildToolSettings(msbuild_settings, tool):
     return msbuild_settings.setdefault(tool.msbuild_name, {})
 
 
-class _Type(object):
+class _Type:
     """Type of settings (Base class)."""
 
     def ValidateMSVS(self, value):
@@ -195,7 +194,7 @@ class _Enumeration(_Type):
     def __init__(self, label_list, new=None):
         _Type.__init__(self)
         self._label_list = label_list
-        self._msbuild_values = set(value for value in label_list if value is not None)
+        self._msbuild_values = {value for value in label_list if value is not None}
         if new is not None:
             self._msbuild_values.update(new)
 
@@ -342,7 +341,7 @@ def _Translate(value, msbuild_settings):
         if value == "true":
             tool_settings = _GetMSBuildToolSettings(msbuild_settings, tool)
             if "AdditionalOptions" in tool_settings:
-                new_flags = "%s %s" % (tool_settings["AdditionalOptions"], flag)
+                new_flags = "{} {}".format(tool_settings["AdditionalOptions"], flag)
             else:
                 new_flags = flag
             tool_settings["AdditionalOptions"] = new_flags
@@ -536,14 +535,14 @@ def _ValidateSettings(validators, settings, stderr):
                         tool_validators[setting](value)
                     except ValueError as e:
                         print(
-                            "Warning: for %s/%s, %s" % (tool_name, setting, e),
+                            f"Warning: for {tool_name}/{setting}, {e}",
                             file=stderr,
                         )
                 else:
                     _ValidateExclusionSetting(
                         setting,
                         tool_validators,
-                        ("Warning: unrecognized setting %s/%s" % (tool_name, setting)),
+                        (f"Warning: unrecognized setting {tool_name}/{setting}"),
                         stderr,
                     )
 

gyp/pylib/gyp/MSVSToolFile.py

@@ -7,7 +7,7 @@
 import gyp.easy_xml as easy_xml
 
 
-class Writer(object):
+class Writer:
     """Visual Studio XML tool file writer."""
 
     def __init__(self, tool_file_path, name):

gyp/pylib/gyp/MSVSUserFile.py

@@ -53,7 +53,7 @@ def _QuoteWin32CommandLineArgs(args):
     return new_args
 
 
-class Writer(object):
+class Writer:
     """Visual Studio XML user user file writer."""
 
     def __init__(self, user_file_path, version, name):
@@ -93,7 +93,7 @@ def AddDebugSettings(
         abs_command = _FindCommandInPath(command[0])
 
         if environment and isinstance(environment, dict):
-            env_list = ['%s="%s"' % (key, val) for (key, val) in environment.items()]
+            env_list = [f'{key}="{val}"' for (key, val) in environment.items()]
             environment = " ".join(env_list)
         else:
             environment = ""

gyp/pylib/gyp/MSVSUtil.py

@@ -55,7 +55,7 @@ def _SuffixName(name, suffix):
     Target name with suffix added (foo_suffix#target)
   """
     parts = name.rsplit("#", 1)
-    parts[0] = "%s_%s" % (parts[0], suffix)
+    parts[0] = "{}_{}".format(parts[0], suffix)
     return "#".join(parts)
 
 
@@ -160,7 +160,7 @@ def _GetPdbPath(target_dict, config_name, vars):
         return pdb_path
 
     pdb_base = target_dict.get("product_name", target_dict["target_name"])
-    pdb_base = "%s.%s.pdb" % (pdb_base, TARGET_TYPE_EXT[target_dict["type"]])
+    pdb_base = "{}.{}.pdb".format(pdb_base, TARGET_TYPE_EXT[target_dict["type"]])
     pdb_path = vars["PRODUCT_DIR"] + "/" + pdb_base
 
     return pdb_path

gyp/pylib/gyp/MSVSVersion.py

@@ -18,7 +18,7 @@ def JoinPath(*args):
     return os.path.normpath(os.path.join(*args))
 
 
-class VisualStudioVersion(object):
+class VisualStudioVersion:
     """Information regarding a version of Visual Studio."""
 
     def __init__(
@@ -235,7 +235,7 @@ def _RegistryGetValueUsingWinReg(key, value):
         assert root == "HKLM"  # Only need HKLM for now.
         with OpenKey(HKEY_LOCAL_MACHINE, subkey) as hkey:
             return QueryValueEx(hkey, value)[0]
-    except WindowsError:
+    except OSError:
         return None
 
 

gyp/pylib/gyp/__init__.py

@@ -4,7 +4,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-from __future__ import print_function
 
 import copy
 import gyp.input
@@ -193,7 +192,7 @@ def ShlexEnv(env_name):
 
 def FormatOpt(opt, value):
     if opt.startswith("--"):
-        return "%s=%s" % (opt, value)
+        return f"{opt}={value}"
     return opt + value
 
 

gyp/pylib/gyp/common.py

@@ -20,7 +20,7 @@
 
 # A minimal memoizing decorator. It'll blow up if the args aren't immutable,
 # among other "problems".
-class memoize(object):
+class memoize:
     def __init__(self, func):
         self.func = func
         self.cache = {}
@@ -348,7 +348,7 @@ def WriteOnDiff(filename):
     the target if it differs (on close).
   """
 
-    class Writer(object):
+    class Writer:
         """Wrapper around file which only covers the target if it differs."""
 
         def __init__(self):
@@ -566,8 +566,8 @@ def pop(self, last=True):  # pylint: disable=W0221
 
     def __repr__(self):
         if not self:
-            return "%s()" % (self.__class__.__name__,)
-        return "%s(%r)" % (self.__class__.__name__, list(self))
+            return f"{self.__class__.__name__}()"
+        return "{}({!r})".format(self.__class__.__name__, list(self))
 
     def __eq__(self, other):
         if isinstance(other, OrderedSet):

gyp/pylib/gyp/easy_xml.py

@@ -84,7 +84,7 @@ def _ConstructContentList(xml_parts, specification, pretty, level=0):
     rest = specification[1:]
     if rest and isinstance(rest[0], dict):
         for at, val in sorted(rest[0].items()):
-            xml_parts.append(' %s="%s"' % (at, _XmlEscape(val, attr=True)))
+            xml_parts.append(' {}="{}"'.format(at, _XmlEscape(val, attr=True)))
         rest = rest[1:]
     if rest:
         xml_parts.append(">")
@@ -101,7 +101,7 @@ def _ConstructContentList(xml_parts, specification, pretty, level=0):
                 _ConstructContentList(xml_parts, child_spec, pretty, level + 1)
         if multi_line and indentation:
             xml_parts.append(indentation)
-        xml_parts.append("</%s>%s" % (name, new_line))
+        xml_parts.append(f"</{name}>{new_line}")
     else:
         xml_parts.append("/>%s" % new_line)
 
@@ -125,9 +125,9 @@ def WriteXmlIfChanged(content, path, encoding="utf-8", pretty=False, win32=False
 
     # Get the old content
     try:
-        with open(path, "r") as file:
+        with open(path) as file:
             existing = file.read()
-    except IOError:
+    except OSError:
         existing = None
 
     # It has changed, write it

gyp/pylib/gyp/flock_tool.py

@@ -18,7 +18,7 @@ def main(args):
     executor.Dispatch(args)
 
 
-class FlockTool(object):
+class FlockTool:
     """This class emulates the 'flock' command."""
 
     def Dispatch(self, args):

gyp/pylib/gyp/generator/analyzer.py

@@ -62,7 +62,6 @@
 then the "all" target includes "b1" and "b2".
 """
 
-from __future__ import print_function
 
 import gyp.common
 import json
@@ -216,7 +215,7 @@ def _ExtractSources(target, target_dict, toplevel_dir):
     return results
 
 
-class Target(object):
+class Target:
     """Holds information about a particular target:
   deps: set of Targets this Target depends upon. This is not recursive, only the
     direct dependent Targets.
@@ -252,7 +251,7 @@ def __init__(self, name):
         self.is_or_has_linked_ancestor = False
 
 
-class Config(object):
+class Config:
     """Details what we're looking for
   files: set of files to search for
   targets: see file description for details."""
@@ -271,10 +270,10 @@ def Init(self, params):
         if not config_path:
             return
         try:
-            f = open(config_path, "r")
+            f = open(config_path)
             config = json.load(f)
             f.close()
-        except IOError:
+        except OSError:
             raise Exception("Unable to open file " + config_path)
         except ValueError as e:
             raise Exception("Unable to parse config file " + config_path + str(e))
@@ -586,7 +585,7 @@ def _WriteOutput(params, **values):
         f = open(output_path, "w")
         f.write(json.dumps(values) + "\n")
         f.close()
-    except IOError as e:
+    except OSError as e:
         print("Error writing to output file", output_path, str(e))
 
 
@@ -627,7 +626,7 @@ def CalculateVariables(default_variables, params):
         default_variables.setdefault("OS", operating_system)
 
 
-class TargetCalculator(object):
+class TargetCalculator:
     """Calculates the matching test_targets and matching compile_targets."""
 
     def __init__(