Commit c4405aad authored by Victor Stinner's avatar Victor Stinner

Issue #6011: sysconfig and distutils.sysconfig use the surrogateescape error

handler to parse the Makefile file. Avoid a UnicodeDecodeError if the source
code directory name contains a non-ASCII character and the locale encoding is
ASCII.
parent d6acf066
...@@ -271,7 +271,7 @@ def parse_makefile(fn, g=None): ...@@ -271,7 +271,7 @@ def parse_makefile(fn, g=None):
used instead of a new dictionary. used instead of a new dictionary.
""" """
from distutils.text_file import TextFile from distutils.text_file import TextFile
fp = TextFile(fn, strip_comments=1, skip_blanks=1, join_lines=1) fp = TextFile(fn, strip_comments=1, skip_blanks=1, join_lines=1, errors="surrogateescape")
if g is None: if g is None:
g = {} g = {}
......
...@@ -58,6 +58,8 @@ class TextFile: ...@@ -58,6 +58,8 @@ class TextFile:
collapse_join [default: false] collapse_join [default: false]
strip leading whitespace from lines that are joined to their strip leading whitespace from lines that are joined to their
predecessor; only matters if (join_lines and not lstrip_ws) predecessor; only matters if (join_lines and not lstrip_ws)
errors [default: 'strict']
error handler used to decode the file content
Note that since 'rstrip_ws' can strip the trailing newline, the Note that since 'rstrip_ws' can strip the trailing newline, the
semantics of 'readline()' must differ from those of the builtin file semantics of 'readline()' must differ from those of the builtin file
...@@ -72,6 +74,7 @@ class TextFile: ...@@ -72,6 +74,7 @@ class TextFile:
'rstrip_ws': 1, 'rstrip_ws': 1,
'join_lines': 0, 'join_lines': 0,
'collapse_join': 0, 'collapse_join': 0,
'errors': 'strict',
} }
def __init__(self, filename=None, file=None, **options): def __init__(self, filename=None, file=None, **options):
...@@ -111,7 +114,7 @@ class TextFile: ...@@ -111,7 +114,7 @@ class TextFile:
"""Open a new file named 'filename'. This overrides both the """Open a new file named 'filename'. This overrides both the
'filename' and 'file' arguments to the constructor.""" 'filename' and 'file' arguments to the constructor."""
self.filename = filename self.filename = filename
self.file = io.open(self.filename, 'r') self.file = io.open(self.filename, 'r', errors=self.errors)
self.current_line = 0 self.current_line = 0
def close(self): def close(self):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment