From 1b03e0dca6e8c025a6d573118d7825a518c176e7 Mon Sep 17 00:00:00 2001 From: Avasam Date: Mon, 25 Mar 2024 16:37:17 -0400 Subject: [PATCH] Use version_info's namedtuple fields --- .github/workflows/download-arm64-libs.py | 2 +- Pythonwin/pywin/test/test_exe.py | 2 +- com/win32com/__init__.py | 2 +- com/win32com/server/register.py | 2 +- com/win32com/test/util.py | 3 ++- pywin32_postinstall.py | 10 ++++++---- setup.py | 10 +++++----- win32/Lib/pywintypes.py | 4 ++-- win32/Lib/win32serviceutil.py | 2 +- 9 files changed, 20 insertions(+), 17 deletions(-) diff --git a/.github/workflows/download-arm64-libs.py b/.github/workflows/download-arm64-libs.py index 21b23cc79..51c5bcd02 100644 --- a/.github/workflows/download-arm64-libs.py +++ b/.github/workflows/download-arm64-libs.py @@ -19,7 +19,7 @@ dest = dest.absolute() dest.mkdir(parents=True, exist_ok=True) -VERSION = "{}.{}.{}".format(*sys.version_info[:3]) +VERSION = f"{sys.version_info.major}.{sys.version_info.minor}.{sys.version_info.micro}" if sys.version_info.releaselevel == "alpha": VERSION += f"-a{sys.version_info.serial}" if sys.version_info.releaselevel == "beta": diff --git a/Pythonwin/pywin/test/test_exe.py b/Pythonwin/pywin/test/test_exe.py index 6e59bc396..3063c3eed 100644 --- a/Pythonwin/pywin/test/test_exe.py +++ b/Pythonwin/pywin/test/test_exe.py @@ -41,7 +41,7 @@ def setUp(self): # XXX Pythonwin.exe / win32uihostglue.h could be improved to search # the Python DLL itself via registry when local / relative search fails. - pydll = "Python{}{}.dll".format(*sys.version_info[:2]) # same for 32bit + pydll = f"Python{sys.version_info.major}{sys.version_info.minor}.dll" # same for 32bit src = os.path.dirname(sys.executable) + os.sep + pydll dst = os.path.dirname(pythonwinexe_path) + os.sep + pydll if not os.path.isfile(dst): diff --git a/com/win32com/__init__.py b/com/win32com/__init__.py index 4832d9e1f..44ca3c207 100644 --- a/com/win32com/__init__.py +++ b/com/win32com/__init__.py @@ -113,7 +113,7 @@ def __PackageSupportBuildPath__(package_path): __gen_path__ = os.path.join( win32api.GetTempPath(), "gen_py", - "%d.%d" % (sys.version_info[0], sys.version_info[1]), + "%d.%d" % (sys.version_info.major, sys.version_info.minor), ) # we must have a __gen_path__, but may not have a gen_py module - diff --git a/com/win32com/server/register.py b/com/win32com/server/register.py index ad3813317..8fec5a577 100644 --- a/com/win32com/server/register.py +++ b/com/win32com/server/register.py @@ -246,7 +246,7 @@ def RegisterServer( loadername = os.path.join( pythoncom_dir, "pythoncomloader%d%d%s.dll" - % (sys.version_info[0], sys.version_info[1], suffix), + % (sys.version_info.major, sys.version_info.minor, suffix), ) dllName = loadername if os.path.isfile(loadername) else pythoncom.__file__ diff --git a/com/win32com/test/util.py b/com/win32com/test/util.py index a80987598..6ded9a525 100644 --- a/com/win32com/test/util.py +++ b/com/win32com/test/util.py @@ -50,7 +50,8 @@ def RegisterPythonServer(filename, progids=None, verbose=0): break ok_files = [ os.path.basename(pythoncom.__file__), - "pythoncomloader%d%d.dll" % (sys.version_info[0], sys.version_info[1]), + "pythoncomloader%d%d.dll" + % (sys.version_info.major, sys.version_info.minor), ] if os.path.basename(dll) not in ok_files: why_not = ( diff --git a/pywin32_postinstall.py b/pywin32_postinstall.py index 5a4981edc..1b3f9ca57 100644 --- a/pywin32_postinstall.py +++ b/pywin32_postinstall.py @@ -180,8 +180,8 @@ def LoadSystemModule(lib_dir, modname): suffix = "_d" if "_d.pyd" in importlib.machinery.EXTENSION_SUFFIXES else "" filename = "%s%d%d%s.dll" % ( modname, - sys.version_info[0], - sys.version_info[1], + sys.version_info.major, + sys.version_info.minor, suffix, ) filename = os.path.join(lib_dir, "pywin32_system32", filename) @@ -348,8 +348,10 @@ def get_shortcuts_folder(): get_root_hkey(), root_key_name + "\\InstallPath\\InstallGroup" ) except OSError: - vi = sys.version_info - install_group = "Python %d.%d" % (vi[0], vi[1]) + install_group = "Python %d.%d" % ( + sys.version_info.major, + sys.version_info.minor, + ) return os.path.join(fldr, install_group) diff --git a/setup.py b/setup.py index 4181b0f4d..35bb33d22 100644 --- a/setup.py +++ b/setup.py @@ -59,8 +59,8 @@ if not "." in build_id_patch: build_id_patch = build_id_patch + ".0" pywin32_version = "%d.%d.%s" % ( - sys.version_info[0], - sys.version_info[1], + sys.version_info.major, + sys.version_info.minor, build_id_patch, ) print("Building pywin32", pywin32_version) @@ -746,8 +746,8 @@ def build_extension(self, ext): # are expected to be pywintypes.lib. created = "%s%d%d%s" % ( ext.name, - sys.version_info[0], - sys.version_info[1], + sys.version_info.major, + sys.version_info.minor, extra, ) needed = f"{ext.name}{extra}" @@ -779,7 +779,7 @@ def get_ext_filename(self, name): # We need to fixup some target filenames. suffix = "_d" if self.debug else "" if name in ["pywintypes", "pythoncom"]: - ver = f"{sys.version_info[0]}{sys.version_info[1]}" + ver = f"{sys.version_info.major}{sys.version_info.minor}" return f"{name}{ver}{suffix}.dll" if name in ["perfmondata", "PyISAPI_loader"]: return f"{name}{suffix}.dll" diff --git a/win32/Lib/pywintypes.py b/win32/Lib/pywintypes.py index 14f9407c5..14ae04b68 100644 --- a/win32/Lib/pywintypes.py +++ b/win32/Lib/pywintypes.py @@ -26,8 +26,8 @@ def __import_pywin32_system_module__(modname, globs): suffix = "_d" if "_d.pyd" in importlib.machinery.EXTENSION_SUFFIXES else "" filename = "%s%d%d%s.dll" % ( modname, - sys.version_info[0], - sys.version_info[1], + sys.version_info.major, + sys.version_info.minor, suffix, ) if hasattr(sys, "frozen"): diff --git a/win32/Lib/win32serviceutil.py b/win32/Lib/win32serviceutil.py index fd4be7a5e..2412901bd 100644 --- a/win32/Lib/win32serviceutil.py +++ b/win32/Lib/win32serviceutil.py @@ -63,7 +63,7 @@ def LocatePythonServiceExe(exe=None): # (Unlike the .exe above, we don't unconditionally copy this, and possibly # copy it to a different place. Doesn't seem a good reason for that!?) python_dll = win32api.GetModuleFileName(sys.dllhandle) - pyw = f"pywintypes{sys.version_info[0]}{sys.version_info[1]}{suffix}.dll" + pyw = f"pywintypes{sys.version_info.major}{sys.version_info.minor}{suffix}.dll" correct_pyw = os.path.join(os.path.dirname(python_dll), pyw) if not os.path.exists(correct_pyw):