Skip to content

Handle utf-8 output by kpathsea on Windows. #12253

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
merged 1 commit into from
Sep 27, 2018
Merged

Handle utf-8 output by kpathsea on Windows. #12253

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 13 additions & 6 deletions lib/matplotlib/dviread.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

import numpy as np

from matplotlib import rcParams
from matplotlib import cbook, rcParams

_log = logging.getLogger(__name__)

Expand Down Expand Up @@ -990,6 +990,8 @@ def find_tex_file(filename, format=None):
kpathsea. It is also available as part of MikTeX, a popular
distribution on Windows.

*If the file is not found, an empty string is returned*.

Parameters
----------
filename : string or bytestring
Expand All @@ -1015,11 +1017,16 @@ def find_tex_file(filename, format=None):
if format is not None:
cmd += ['--format=' + format]
cmd += [filename]
_log.debug('find_tex_file(%s): %s', filename, cmd)
pipe = subprocess.Popen(cmd, stdout=subprocess.PIPE)
result = pipe.communicate()[0].rstrip()
_log.debug('find_tex_file result: %s', result)
return result.decode('ascii')
try: # Below: strip final newline.
result = cbook._check_and_log_subprocess(cmd, _log)[:-1]
except RuntimeError:
return ''
if os.name == 'nt':
# On Windows only, kpathsea appears to use utf-8 output(?); see
# __win32_fputs in the kpathsea sources and mpl issue #11848.
return result.decode('utf-8')
else:
return os.fsdecode(result)


@lru_cache()
Expand Down