Skip to content

Drop Python 2 support #1158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lostmsu merged 8 commits into from
Jun 20, 2020
Merged

Drop Python 2 support #1158

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
705ba83
Drop Python 2 support
filmor Jun 14, 2020
7a34854
Drop Python 2 tests
filmor Jun 14, 2020
048219d
Drop a few more references to the version and fix build on Windows
filmor Jun 14, 2020
aad0427
Drop accidentally committed interop
filmor Jun 14, 2020
e1d6034
Fix the dotted/undotted logic
filmor Jun 14, 2020
d19b813
Fix a few more tests
filmor Jun 19, 2020
6dc7471
Drop more Python 2 checks
filmor Jun 19, 2020
cc4211c
Drop tests._compat module entirely
filmor Jun 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Drop more Python 2 checks
  • Loading branch information
@filmor
filmor committed Jun 19, 2020
commit 6dc74714df3fca3f1705064ac8cb09a442a97ab6
7 changes: 1 addition & 6 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,6 @@
def _check_output(*args, **kwargs):
"""Check output wrapper for py2/py3 compatibility"""
output = subprocess.check_output(*args, **kwargs)
if PY_MAJOR == 2:
return output
return output.decode("ascii")


Expand Down Expand Up @@ -475,10 +473,7 @@ def _find_msbuild_tool(self, tool="msbuild.exe", use_windows_sdk=False):
return path

# Search within registry to find build tools
try: # PY2
import _winreg as winreg
except ImportError: # PY3
import winreg
import winreg

_collect_installed_windows_kits_v10(winreg)

Expand Down