Skip to content
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.

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

gh-98790: When DLLs directory is missing on Windows, assume executable_dir contains PYD files instead #98936

Merged
merged 6 commits into from
Nov 2, 2022

Conversation

zooba
Copy link
Member

@zooba zooba commented Nov 1, 2022

Copy link
Member

@FFY00 FFY00 left a comment

Choose a reason for hiding this comment

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

As I mentioned in #98790 (comment), I think trying to make the behavior closer to what it used to be is the right approach for now, so I am in favor of this fix 👍

@zooba
Copy link
Member Author

zooba commented Nov 1, 2022

We're quite a way away from the old behaviour, which was basically a hard-coded (incorrect) default. What I just pushed is going to handle the missing DLLs directory case best, but by omitting the path and shifting the actual one up in the order. Previously, there'd be references to the missing directories, which isn't great, so I fixed that up.

Also dropped the search on Windows, which we never used to do and is just as unsafe on Windows as it is anywhere else.

@zooba zooba merged commit 3d889dc into python:main Nov 2, 2022
@miss-islington
Copy link
Contributor

Thanks @zooba for the PR 🌮🎉.. I'm working now to backport this PR to: 3.11.
🐍🍒⛏🤖

@zooba zooba deleted the gh-98790-2 branch November 2, 2022 18:38
@miss-islington
Copy link
Contributor

Sorry, @zooba, I could not cleanly backport this to 3.11 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 3d889dc0a0efa6fcbd984ece365c9ac08d2cd4a9 3.11

@bedevere-bot
Copy link

GH-99019 is a backport of this pull request to the 3.11 branch.

@bedevere-bot bedevere-bot removed the needs backport to 3.11 only security fixes label Nov 2, 2022
zooba added a commit to zooba/cpython that referenced this pull request Nov 2, 2022
zooba added a commit that referenced this pull request Nov 2, 2022
@gpshead
Copy link
Member

gpshead commented Dec 14, 2022

This appears to have caused a regression in 3.11.1 forcing some people to stick with 3.11.0: #100171

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants