FIX

jklymak · jklymak · commit fd5c9fe83749 · 2023-04-11T19:20:47.000-07:00
diff --git a/lib/matplotlib/_tight_bbox.py b/lib/matplotlib/_tight_bbox.py
@@ -4,7 +4,6 @@
 
 from matplotlib.transforms import Bbox, TransformedBbox, Affine2D
 
-import numpy as np
 
 def adjust_bbox(fig, bbox_inches, fixed_dpi=None):
     """
@@ -58,12 +57,8 @@ def restore_bbox():
     dpi_scale = fixed_dpi / fig.dpi
 
     fig.bbox_inches = Bbox.from_bounds(0, 0, *bbox_inches.size)
-    print(bbox_inches.p0)
-    x0 = np.floor(bbox_inches.p0[0]*fig.dpi * dpi_scale)
-    y0 = np.floor(bbox_inches.p0[1]*fig.dpi * dpi_scale)
-    # x0, y0 = tr.transform(bbox_inches.p0)
+    x0, y0 = tr.transform(bbox_inches.p0)
     w1, h1 = fig.bbox.size * dpi_scale
-    print('x0, y0, w1, h1', x0, y0, w1, h1, fig.bbox)
     fig.transFigure._boxout = Bbox.from_bounds(-x0, -y0, w1, h1)
     fig.transFigure.invalidate()
 
diff --git a/lib/matplotlib/cbook.py b/lib/matplotlib/cbook.py
@@ -1277,10 +1277,7 @@ def _to_unmasked_float_array(x):
     if hasattr(x, 'mask'):
         return np.ma.asarray(x, float).filled(np.nan)
     else:
-        try:
-            return np.asarray(x, float)
-        except TypeError:
-            return np.asarray([float(xx) for xx in x])
+        return np.asarray(x, float)
 
 
 def _check_1d(x):
diff --git a/lib/matplotlib/sphinxext/plot_directive.py b/lib/matplotlib/sphinxext/plot_directive.py
@@ -306,7 +306,7 @@ def setup(app):
     app.add_config_value('plot_apply_rcparams', False, True)
     app.add_config_value('plot_working_directory', None, True)
     app.add_config_value('plot_template', None, True)
-    app.add_config_value('plot_srcset', None, True)
+    app.add_config_value('plot_srcset', [], True)
     app.connect('doctree-read', mark_plot_labels)
     app.add_css_file('plot_directive.css')
     app.connect('build-finished', _copy_css_file)
@@ -596,7 +596,7 @@ def _parse_srcset(entries):
             mult = entry[:-1]
             srcset[float(mult)] = entry
         else:
-            raise ExtensionError('srcset argument "{entry}" is invalid.')
+            raise ExtensionError('srcset argument {entry!r} is invalid.')
     return srcset
 
 
@@ -703,8 +703,8 @@ def render_figures(code, code_path, output_dir, output_base, context,
                     if fmt == formats[0][0] and config.plot_srcset:
                         # save a 2x, 3x etc version of the default...
                         srcset = _parse_srcset(config.plot_srcset)
-                        for mult in srcset:
-                            fm = srcset[mult] + '.' + fmt
+                        for mult, suffix in srcset.items():
+                            fm = f'{suffix}.{fmt}'
                             img.formats.append(fm)
                             figman.canvas.figure.savefig(img.filename(fm),
                                                          dpi=int(dpi * mult))
@@ -876,7 +876,7 @@ def run(arguments, content, options, state_machine, state, lineno):
 
     # Properly indent the caption
     if caption and config.plot_srcset:
-        caption = ':caption: ' + caption
+        caption = f':caption: {caption}'
     elif caption:
         caption = '\n' + '\n'.join('      ' + line.strip()
                                    for line in caption.split('\n'))
diff --git a/lib/matplotlib/tests/test_sphinxext.py b/lib/matplotlib/tests/test_sphinxext.py
@@ -192,7 +192,7 @@ def test_srcset_version(tmp_path):
     doctree_dir = tmp_path / 'doctrees'
 
     build_sphinx_html(tmp_path, doctree_dir, html_dir, extra_args=[
-        '-c', f'{tmp_path}/confSrcset/'])
+        '-D', 'plot_srcset=2x'])
 
     def plot_file(num, suff=''):
         return img_dir / f'some_plots-{num}{suff}.png'
diff --git a/lib/matplotlib/tests/tinypages/confSrcset/conf.py b/lib/matplotlib/tests/tinypages/confSrcset/conf.py
