8000 Fix issue with tex-encoding on non-Unicode platforms · matplotlib/matplotlib@8c13417 · GitHub
[go: up one dir, main page]
Skip to content

Commit 8c13417

Browse files
oscargusoscargus
committed
Fix issue with tex-encoding on non-Unicode platforms
1 parent 63e9ea3 commit 8c13417

File tree

2 files changed

+27
-2
lines changed

2 files changed

+27
-2
lines changed

‎lib/matplotlib/tests/test_texmanager.py

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
11
from pathlib import Path
22
import re
33

4+
import matplotlib as mpl
45
import matplotlib.pyplot as plt
56
from matplotlib.texmanager import TexManager
67
import pytest
78

89

10+
needs_usetex = pytest.mark.skipif(
11+
not mpl.checkdep_usetex(True),
12+
reason="This test needs a TeX installation")
13+
14+
915
def test_fontconfig_preamble():
1016
"""Test that the preamble is included in the source."""
1117
plt.rcParams['text.usetex'] = True
@@ -39,3 +45,20 @@ def test_font_selection(rc, preamble, family):
3945
src = Path(tm.make_tex("hello, world", fontsize=12)).read_text()
4046
assert preamble in src
4147
assert [*re.findall(r"\\\w+family", src)] == [family]
48+
49+
50+
@needs_usetex
51+
def test_unicode_characters():
52+
# Smoke test to see that Unicode characters does not cause issues
53+
# See #23019
54+
plt.rcParams['text.usetex'] = True
55+
fig, ax = plt.subplots()
56+
ax.set_ylabel('\\textit{Velocity (\N{DEGREE SIGN}/sec)}')
57+
ax.set_xlabel('\N{VULGAR FRACTION ONE QUARTER}Öøæ')
58+
fig.canvas.draw()
59+
60+
# But not all characters.
61+
# Should raise RuntimeError, not UnicodeDecodeError
62+
with pytest.raises(RuntimeError):
63+
ax.set_title('\N{SNOWMAN}')
64+
fig.canvas.draw()

‎lib/matplotlib/texmanager.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,8 @@ def make_tex(cls, tex, fontsize):
243243
Return the file name.
244244
"""
245245
texfile = cls.get_basefile(tex, fontsize) + ".tex"
246-
Path(texfile).write_text(cls._get_tex_source(tex, fontsize))
246+
Path(texfile).write_text(cls._get_tex_source(tex, fontsize),
247+
encoding='utf-8')
247248
return texfile
248249

249250
@classmethod
@@ -265,7 +266,8 @@ def _run_checked_subprocess(cls, command, tex, *, cwd=None):
265266
'{exc}\n\n'.format(
266267
prog=command[0],
267268
tex=tex.encode('unicode_escape'),
268-
exc=exc.output.decode('utf-8'))) from exc
269+
exc=exc.output.decode('utf-8', 'backslashreplace'))
270+
) from exc
269271
_log.debug(report)
270272
return report
271273

0 commit comments

Comments
 (0)
0