Merge remote-tracking branch 'upstream/master'

sasoripathos · sasoripathos · commit 8cbafae0e32e · 2019-05-07T20:11:02.000-04:00
diff --git a/doc/api/next_api_changes/2019-05-05-AL.rst b/doc/api/next_api_changes/2019-05-05-AL.rst
@@ -0,0 +1,4 @@
+Deprecations
+````````````
+
+The ``dryrun`` parameter to the various ``FigureCanvasFoo.print_foo`` methods is deprecated.
diff --git a/examples/images_contours_and_fields/plot_streamplot.py b/examples/images_contours_and_fields/plot_streamplot.py
@@ -6,11 +6,11 @@
 A stream plot, or streamline plot, is used to display 2D vector fields. This
 example shows a few features of the :meth:`~.axes.Axes.streamplot` function:
 
-    * Varying the color along a streamline.
-    * Varying the density of streamlines.
-    * Varying the line width along a streamline.
-    * Controlling the starting points of streamlines.
-    * Streamlines skipping masked regions and NaN values.
+* Varying the color along a streamline.
+* Varying the density of streamlines.
+* Varying the line width along a streamline.
+* Controlling the starting points of streamlines.
+* Streamlines skipping masked regions and NaN values.
 """
 import numpy as np
 import matplotlib.pyplot as plt
diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py
@@ -1528,6 +1528,27 @@ def __init__(self, name, canvas, key, x=0, y=0, guiEvent=None):
         self.key = key
 
 
+def _get_renderer(figure, print_method):
+    """
+    Get the renderer that would be used to save a `~.Figure`, and cache it on
+    the figure.
+    """
+    # This is implemented by triggering a draw, then immediately jumping out of
+    # Figure.draw() by raising an exception.
+
+    class Done(Exception):
+        pass
+
+    def _draw(renderer): raise Done(renderer)
+
+    with cbook._setattr_cm(figure, draw=_draw):
+        try:
+            print_method(io.BytesIO())
+        except Done as exc:
+            figure._cachedRenderer, = exc.args
+            return figure._cachedRenderer
+
+
 class FigureCanvasBase(object):
     """
     The canvas the figure renders into.
@@ -2038,20 +2059,11 @@ def print_figure(self, filename, dpi=None, facecolor=None, edgecolor=None,
                 bbox_inches = rcParams['savefig.bbox']
 
             if bbox_inches:
-                # call adjust_bbox to save only the given area
                 if bbox_inches == "tight":
-                    # When bbox_inches == "tight", it saves the figure twice.
-                    # The first save command (to a BytesIO) is just to estimate
-                    # the bounding box of the figure.
-                    result = print_method(
-                        io.BytesIO(),
-                        dpi=dpi,
-                        facecolor=facecolor,
-                        edgecolor=edgecolor,
-                        orientation=orientation,
-                        dryrun=True,
-                        **kwargs)
-                    renderer = self.figure._cachedRenderer
+                    renderer = _get_renderer(
+                        self.figure,
+                        functools.partial(
+                            print_method, dpi=dpi, orientation=orientation))
                     bbox_artists = kwargs.pop("bbox_extra_artists", None)
                     bbox_inches = self.figure.get_tightbbox(renderer,
                             bbox_extra_artists=bbox_artists)
@@ -2061,6 +2073,7 @@ def print_figure(self, filename, dpi=None, facecolor=None, edgecolor=None,
 
                     bbox_inches = bbox_inches.padded(pad)
 
+                # call adjust_bbox to save only the given area
                 restore_bbox = tight_bbox.adjust_bbox(self.figure, bbox_inches,
                                                       canvas.fixed_dpi)
 
diff --git a/lib/matplotlib/backends/backend_agg.py b/lib/matplotlib/backends/backend_agg.py
@@ -544,6 +544,7 @@ def print_to_buffer(self):
         # print_figure(), and the latter ensures that `self.figure.dpi` already
         # matches the dpi kwarg (if any).
 
+        @cbook._delete_parameter("3.2", "dryrun")
         def print_jpg(self, filename_or_obj, *args, dryrun=False,
                       pil_kwargs=None, **kwargs):
             """
@@ -598,6 +599,7 @@ def print_jpg(self, filename_or_obj, *args, dryrun=False,
 
         print_jpeg = print_jpg
 
+        @cbook._delete_parameter("3.2", "dryrun")
         def print_tif(self, filename_or_obj, *args, dryrun=False,
                       pil_kwargs=None, **kwargs):
             buf, size = self.print_to_buffer()
diff --git a/lib/matplotlib/backends/backend_pgf.py b/lib/matplotlib/backends/backend_pgf.py
@@ -775,6 +775,7 @@ class FigureCanvasPgf(FigureCanvasBase):
     def get_default_filetype(self):
         return 'pdf'
 
+    @cbook._delete_parameter("3.2", "dryrun")
     def _print_pgf_to_fh(self, fh, *args,
                          dryrun=False, bbox_inches_restore=None, **kwargs):
         if dryrun:
diff --git a/lib/matplotlib/backends/backend_ps.py b/lib/matplotlib/backends/backend_ps.py
@@ -870,6 +870,7 @@ def _print_ps(self, outfile, format, *args,
                                orientation, isLandscape, papertype,
                                **kwargs)
 
+    @cbook._delete_parameter("3.2", "dryrun")
     def _print_figure(
             self, outfile, format, dpi=72, facecolor='w', edgecolor='w',
             orientation='portrait', isLandscape=False, papertype=None,
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -1867,7 +1867,8 @@ def text(self, x, y, s, fontdict=None, withdash=False, **kwargs):
         """
         default = dict(transform=self.transFigure)
 
-        if withdash:
+        if (withdash
+                and withdash is not cbook.deprecation._deprecated_parameter):
             text = TextWithDash(x=x, y=y, text=s)
         else:
             text = Text(x=x, y=y, text=s)
diff --git a/lib/matplotlib/table.py b/lib/matplotlib/table.py
@@ -459,6 +459,7 @@ def get_children(self):
 
     def get_window_extent(self, renderer):
         """Return the bounding box of the table in window coords."""
+        self._update_positions(renderer)
         boxes = [cell.get_window_extent(renderer)
                  for cell in self._cells.values()]
         return Bbox.union(boxes)
diff --git a/lib/matplotlib/textpath.py b/lib/matplotlib/textpath.py
@@ -312,18 +312,10 @@ def get_glyphs_tex(self, prop, s, glyph_map=None,
                 font.set_size(self.FONT_SCALE, self.DPI)
                 # See comments in _get_ps_font_and_encoding.
                 if enc is not None:
-                    if glyph not in enc:
-                        _log.warning(
-                            "The glyph %d of font %s cannot be converted with "
-                            "the encoding; glyph may be wrong.",
-                            glyph, font.fname)
-                        font.load_char(glyph, flags=LOAD_TARGET_LIGHT)
-                    else:
-                        index = font.get_name_index(enc[glyph])
-                        font.load_glyph(index, flags=LOAD_TARGET_LIGHT)
+                    index = font.get_name_index(enc[glyph])
+                    font.load_glyph(index, flags=LOAD_TARGET_LIGHT)
                 else:
-                    index = glyph
-                    font.load_char(index, flags=LOAD_TARGET_LIGHT)
+                    font.load_char(glyph, flags=LOAD_TARGET_LIGHT)
                 glyph_map_new[char_id] = font.get_path()
 
             glyph_ids.append(char_id)
