gh-110119: Fix test_importlib --disable-gil Windows test failures
#110422
Conversation
…ures Use "t" in the expected tag for `--disable-gil` builds in test_tagged_suffix.
colesbury
requested review from
brettcannon,
ericsnowcurrently,
ncoghlan and
warsaw
as code owners
|
cc @itamaro - this fixes one of the two Windows (EDIT: s/test_importlib/test_peg_generator) |
| threading_tag = "t" if sysconfig.get_config_var("Py_NOGIL") else "" | ||
| expected_tag = ".cp{0.major}{0.minor}{1}-{2}.pyd".format(sys.version_info, | ||
| threading_tag, | ||
| re.sub('[^a-zA-Z0-9]', '_', get_platform())) |
There was a problem hiding this comment.
This code looks too complicated for what it is. I suggest:
abi_flags = "t" if sysconfig.get_config_var("Py_NOGIL") else ""
ver = sys.version_info
platform = re.sub('[^a-zA-Z0-9]', '_', get_platform())
expected_tag = f".cp{ver.major}{ver.minor}{abi_flags}-{platform}.pyd"
| @@ -111,8 +112,10 @@ def test_module_not_found(self): | |||
| class WindowsExtensionSuffixTests: | |||
| def test_tagged_suffix(self): | |||
| suffixes = self.machinery.EXTENSION_SUFFIXES | |||
| expected_tag = ".cp{0.major}{0.minor}-{1}.pyd".format(sys.version_info, | |||
| re.sub('[^a-zA-Z0-9]', '_', get_platform())) | |||
| abi_flags = "t" if sysconfig.get_config_var("Py_NOGIL") else "" | |||
There was a problem hiding this comment.
Now I'm confused. On Windows, sys.abiflags doesn't exist? It doesn't look practical that sys.abiflags doesn't exist to look for PYD files :-(
Maybe we should now add this flag?
There was a problem hiding this comment.
The awkward bit is that debug libraries are indicated as a _d prefix like, foo_d.cp313t-win_amd64.pyd instead of as part of the abiflags. Still might be useful.
There was a problem hiding this comment.
We can maybe change that in Python 3.13 to make it consistent.
Use "t" in the expected tag for
--disable-gilbuilds in test_tagged_suffix.--disable-giltest failures due to ABI flag #110119