mirror of
https://github.com/python/cpython.git
synced 2025-09-27 02:39:58 +00:00
gh-77102: site: try utf-8 and locale encoding when reading .pth file (GH-117802)
(cherry picked from commit 6dc661bc9f
)
This commit is contained in:
parent
44eab29cbd
commit
2a58923687
2 changed files with 38 additions and 26 deletions
61
Lib/site.py
61
Lib/site.py
|
@ -179,35 +179,44 @@ def addpackage(sitedir, name, known_paths):
|
|||
return
|
||||
_trace(f"Processing .pth file: {fullname!r}")
|
||||
try:
|
||||
# locale encoding is not ideal especially on Windows. But we have used
|
||||
# it for a long time. setuptools uses the locale encoding too.
|
||||
f = io.TextIOWrapper(io.open_code(fullname), encoding="locale")
|
||||
with io.open_code(fullname) as f:
|
||||
pth_content = f.read()
|
||||
except OSError:
|
||||
return
|
||||
with f:
|
||||
for n, line in enumerate(f):
|
||||
if line.startswith("#"):
|
||||
|
||||
try:
|
||||
pth_content = pth_content.decode()
|
||||
except UnicodeDecodeError:
|
||||
# Fallback to locale encoding for backward compatibility.
|
||||
# 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("#"):
|
||||
continue
|
||||
if line.strip() == "":
|
||||
continue
|
||||
try:
|
||||
if line.startswith(("import ", "import\t")):
|
||||
exec(line)
|
||||
continue
|
||||
if line.strip() == "":
|
||||
continue
|
||||
try:
|
||||
if line.startswith(("import ", "import\t")):
|
||||
exec(line)
|
||||
continue
|
||||
line = line.rstrip()
|
||||
dir, dircase = makepath(sitedir, line)
|
||||
if not dircase in known_paths and os.path.exists(dir):
|
||||
sys.path.append(dir)
|
||||
known_paths.add(dircase)
|
||||
except Exception as exc:
|
||||
print("Error processing line {:d} of {}:\n".format(n+1, fullname),
|
||||
file=sys.stderr)
|
||||
import traceback
|
||||
for record in traceback.format_exception(exc):
|
||||
for line in record.splitlines():
|
||||
print(' '+line, file=sys.stderr)
|
||||
print("\nRemainder of file ignored", file=sys.stderr)
|
||||
break
|
||||
line = line.rstrip()
|
||||
dir, dircase = makepath(sitedir, line)
|
||||
if dircase not in known_paths and os.path.exists(dir):
|
||||
sys.path.append(dir)
|
||||
known_paths.add(dircase)
|
||||
except Exception as exc:
|
||||
print(f"Error processing line {n:d} of {fullname}:\n",
|
||||
file=sys.stderr)
|
||||
import traceback
|
||||
for record in traceback.format_exception(exc):
|
||||
for line in record.splitlines():
|
||||
print(' '+line, file=sys.stderr)
|
||||
print("\nRemainder of file ignored", file=sys.stderr)
|
||||
break
|
||||
if reset:
|
||||
known_paths = None
|
||||
return known_paths
|
||||
|
|
|
@ -0,0 +1,3 @@
|
|||
:mod:`site` module now parses ``.pth`` file with UTF-8 first, and
|
||||
:term:`locale encoding` if ``UnicodeDecodeError`` happened. It supported
|
||||
only locale encoding before.
|
Loading…
Add table
Add a link
Reference in a new issue