Repository navigation
gh-110119: Fix test_importlib --disable-gil Windows test failures - #110422
vstinner merged 2 commits into
Conversation
Sorry, something went wrong.
…ures Use "t" in the expected tag for `--disable-gil` builds in test_tagged_suffix.
|
cc @itamaro - this fixes one of the two Windows --disable-gil buildbot failures. I'm still trying to reproduce the test_peg_generator failures. (EDIT: s/test_importlib/test_peg_generator) |
Sorry, something went wrong.
| 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"
Sorry, something went wrong.
vstinner
left a comment
There was a problem hiding this comment.
LGTM
Sorry, something went wrong.
| 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?
Sorry, something went wrong.
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.
Sorry, something went wrong.
There was a problem hiding this comment.
We can maybe change that in Python 3.13 to make it consistent.
Sorry, something went wrong.
…ures (python#110422) Use "t" in the expected tag for `--disable-gil` builds in test_tagged_suffix.
Use "t" in the expected tag for --disable-gil builds in test_tagged_suffix.