Merge pull request #13946 from meeseeksmachine/auto-backport-of-pr-13924-on-v3.1.x

timhoffm · web-flow · commit a69d48e62795 · 2019-04-13T18:44:53.000+02:00
Backport PR #13924 on branch v3.1.x (Followup to deprecation of usetex parameter in get_text_path.)
diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py
@@ -564,13 +564,7 @@ def _get_text_path_transform(self, x, y, s, prop, angle, ismath):
 
         text2path = self._text2path
         fontsize = self.points_to_pixels(prop.get_size_in_points())
-
-        if ismath == "TeX":
-            verts, codes = text2path.get_text_path(prop, s, ismath=False,
-                                                   usetex=True)
-        else:
-            verts, codes = text2path.get_text_path(prop, s, ismath=ismath,
-                                                   usetex=False)
+        verts, codes = text2path.get_text_path(prop, s, ismath=ismath)
 
         path = Path(verts, codes)
         angle = np.deg2rad(angle)
diff --git a/lib/matplotlib/textpath.py b/lib/matplotlib/textpath.py
@@ -463,12 +463,8 @@ def __init__(self, xy, s, size=None, prop=None,
 
         self._cached_vertices = None
         s, ismath = Text(usetex=usetex)._preprocess_math(s)
-        if ismath == "TeX":
-            self._vertices, self._codes = text_to_path.get_text_path(
-                prop, s, usetex=True)
-        else:
-            self._vertices, self._codes = text_to_path.get_text_path(
-                prop, s, ismath=ismath)
+        self._vertices, self._codes = text_to_path.get_text_path(
+            prop, s, ismath=ismath)
         self._should_simplify = False
         self._simplify_threshold = rcParams['path.simplify_threshold']
         self._interpolation_steps = _interpolation_steps
