Skip to content

gh-110119: Fix test_importlib --disable-gil Windows test failures #110422

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
vstinner merged 2 commits into from
Oct 5, 2023
Merged

gh-110119: Fix test_importlib --disable-gil Windows test failures #110422

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ebec1f
gh-110119: Fix test_importlib `--disable-gil` Windows test failures
colesbury Oct 5, 2023
c6b791b
Use suggestion from vstinner
colesbury Oct 5, 2023
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
Use suggestion from vstinner
  • Loading branch information
@colesbury
colesbury committed Oct 5, 2023
commit c6b791baa59672704bce5832f56121713d016f1b
8 changes: 4 additions & 4 deletions Lib/test/test_importlib/test_windows.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,10 +112,10 @@ def test_module_not_found(self):
class WindowsExtensionSuffixTests:
def test_tagged_suffix(self):
suffixes = self.machinery.EXTENSION_SUFFIXES
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()))
abi_flags = "t" if sysconfig.get_config_var("Py_NOGIL") else ""
Copy link
Copy Markdown
Member

@vstinner vstinner Oct 5, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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?

Copy link
Copy Markdown
Contributor Author

@colesbury colesbury Oct 5, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Copy link
Copy Markdown
Member

@vstinner vstinner Oct 5, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can maybe change that in Python 3.13 to make it consistent.

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"
try:
untagged_i = suffixes.index(".pyd")
except ValueError:
Expand Down