Skip to content

gh-77102: site: try utf-8 and fallback to locale encoding when reading pth file #117802

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
methane merged 4 commits into from
Apr 16, 2024
Merged

gh-77102: site: try utf-8 and fallback to locale encoding when reading pth file #117802

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9e22e88
site: try utf-8 and fallback to locale encoding
methane Apr 12, 2024
4a09f06
add trace for fallback encoding use
methane Apr 15, 2024
72985c1
update docs
methane Apr 15, 2024
88f857b
fix typo
methane Apr 15, 2024
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
Next Next commit
add trace for fallback encoding use
  • Loading branch information
@methane
methane committed Apr 15, 2024
commit 4a09f06af2ef93e0f194a1b01e1da363ae791967
2 changes: 2 additions & 0 deletions Lib/site.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,8 @@ def addpackage(sitedir, name, known_paths):
# We will deprecate this fallback in the future.
import locale
pth_content = pth_content.decode(locale.getencoding())
_trace(f"Cannot read {fullname!r} as UTF-8. "
f"Using fallback encoding {locale.getencoding()!r}")

for n, line in enumerate(pth_content.splitlines(), 1):
if line.startswith("#"):
Expand Down