Skip to content

Simplify and improve pywintypes search for dll in site-packages. #1933

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
mhammond merged 2 commits into from
Aug 22, 2022
Merged

Simplify and improve pywintypes search for dll in site-packages. #1933

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
792a029
Simplify and improve pywintypes search for dll in site-packages.
saaketp Aug 19, 2022
5fe0264
Fix formatting
saaketp Aug 19, 2022
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
21 changes: 8 additions & 13 deletions win32/Lib/pywintypes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,23 +87,18 @@ def __import_pywin32_system_module__(modname, globs):
# In a worst-case, it means, say 'python -c "import win32api"'
# will not work but 'python -c "import pywintypes, win32api"' will,
# but it's better than nothing.
# We prefer the "user" site-packages if it exists...
if found is None:
import site

maybe = os.path.join(site.USER_SITE, "pywin32_system32", filename)
if os.path.isfile(maybe):
found = maybe
# We use the same logic as pywin32_bootstrap to find potential location for the dll
# Simply import pywin32_system32 and look in the paths in pywin32_system32.__path__

# Or the "global" site-packages.
if found is None:
import sysconfig
import pywin32_system32

maybe = os.path.join(
sysconfig.get_paths()["platlib"], "pywin32_system32", filename
)
if os.path.isfile(maybe):
found = maybe
for path in pywin32_system32.__path__:
maybe = os.path.join(path, filename)
if os.path.isfile(maybe):
found = maybe
break

if found is None:
# give up in disgust.
Expand Down