chore(wheelmaker): drop Python 2 support (#1545)
Python2 has been EOL for a while so this is just a small cleanup.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ab4c4d2..57c4eff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -64,6 +64,8 @@
`incompatible_normalize_version` to `True` by default to enforce `PEP440`
for wheel names built by `rules_python`.
+* (tools/wheelmaker.py) drop support for Python 2 as only Python 3 is tested.
+
### Fixed
* Skip aliases for unloaded toolchains. Some Python versions that don't have full
diff --git a/tools/wheelmaker.py b/tools/wheelmaker.py
index 62225b6..3bfaba2 100644
--- a/tools/wheelmaker.py
+++ b/tools/wheelmaker.py
@@ -160,7 +160,7 @@
def add_string(self, filename, contents):
"""Add given 'contents' as filename to the distribution."""
- if sys.version_info[0] > 2 and isinstance(contents, str):
+ if isinstance(contents, str):
contents = contents.encode("utf-8", "surrogateescape")
zinfo = self._zipinfo(filename)
self.writestr(zinfo, contents)
@@ -199,7 +199,7 @@
entries = self._record + [(record_path, b"", b"")]
contents = b""
for filename, digest, size in entries:
- if sys.version_info[0] > 2 and isinstance(filename, str):
+ if isinstance(filename, str):
filename = filename.lstrip("/").encode("utf-8", "surrogateescape")
contents += b"%s,%s,%s\n" % (filename, digest, size)
@@ -530,22 +530,14 @@
description = None
if arguments.description_file:
- if sys.version_info[0] == 2:
- with open(arguments.description_file, "rt") as description_file:
- description = description_file.read()
- else:
- with open(
- arguments.description_file, "rt", encoding="utf-8"
- ) as description_file:
- description = description_file.read()
+ with open(
+ arguments.description_file, "rt", encoding="utf-8"
+ ) as description_file:
+ description = description_file.read()
metadata = None
- if sys.version_info[0] == 2:
- with open(arguments.metadata_file, "rt") as metadata_file:
- metadata = metadata_file.read()
- else:
- with open(arguments.metadata_file, "rt", encoding="utf-8") as metadata_file:
- metadata = metadata_file.read()
+ with open(arguments.metadata_file, "rt", encoding="utf-8") as metadata_file:
+ metadata = metadata_file.read()
if arguments.noincompatible_normalize_version:
version_in_metadata = version
