Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 571a787

Browse files
tacaswelltacaswell
authored
Merge pull request #18515 from QuLogic/delete-backend-deprecations
API: Remove deprecated backend code.
2 parents a010c54 + 9fc8fb5 commit 571a787

File tree

8 files changed

+41
-166
lines changed

8 files changed

+41
-166
lines changed

‎doc/api/next_api_changes/removals/18515-ES.rst

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
GTK
2+
~~~
3+
4+
The following methods and properties have been removed:
5+
6+
* ``ConfigureSubplotsGTK3.destroy`` method
7+
* ``ConfigureSubplotsGTK3.init_window`` method
8+
* ``ConfigureSubplotsGTK3.window`` property
9+
10+
WX
11+
~~
12+
``FigureFrameWx.statusbar``, ``NavigationToolbar2Wx.set_status_bar``, and
13+
``NavigationToolbar2Wx.statbar`` have been removed. The status bar can be
14+
retrieved by calling standard wx methods (``frame.GetStatusBar()`` and
15+
``toolbar.GetTopLevelParent().GetStatusBar()``).
16+
17+
``backend_wx.ConfigureSubplotsWx.configure_subplots`` and
18+
``backend_wx.ConfigureSubplotsWx.get_canvas`` have been removed.
19+
20+
PGF
21+
~~~
22+
``backend_pgf.repl_escapetext`` and ``backend_pgf.repl_mathdefault`` have been
23+
removed.
24+
25+
``RendererPgf.latexManager`` has been removed.
26+
27+
FigureCanvas
28+
~~~~~~~~~~~~
29+
``FigureCanvasBase.draw_cursor`` and ``FigureCanvasMac.invalidate`` have been
30+
removed.
31+
32+
The ``dryrun`` parameter to the various ``FigureCanvasFoo.print_foo`` methods
33+
has been removed.

‎lib/matplotlib/backend_bases.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2035,13 +2035,6 @@ def draw_idle(self, *args, **kwargs):
20352035
with self._idle_draw_cntx():
20362036
self.draw(*args, **kwargs)
20372037

2038-
@cbook.deprecated("3.2")
2039-
def draw_cursor(self, event):
2040-
"""
2041-
Draw a cursor in the event.axes if inaxes is not None. Use
2042-
native GUI drawing for efficiency if possible
2043-
"""
2044-
20452038
def get_width_height(self):
20462039
"""
20472040
Return the figure width and height in points or pixels

‎lib/matplotlib/backends/backend_agg.py

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -247,8 +247,7 @@ def get_text_width_height_descent(self, s, prop, ismath):
247247
d /= 64.0
248248
return w, h, d
249249

250-
@cbook._delete_parameter("3.2", "ismath")
251-
def draw_tex(self, gc, x, y, s, prop, angle, ismath='TeX!', mtext=None):
250+
def draw_tex(self, gc, x, y, s, prop, angle, *, mtext=None):
252251
# docstring inherited
253252
# todo, handle props, angle, origins
254253
size = prop.get_size_in_points()
@@ -525,15 +524,13 @@ def print_to_buffer(self):
525524

526525
@_check_savefig_extra_args(
527526
extra_kwargs=["quality", "optimize", "progressive"])
528-
@cbook._delete_parameter("3.2", "dryrun")
529527
@cbook._delete_parameter("3.3", "quality",
530528
alternative="pil_kwargs={'quality': ...}")
531529
@cbook._delete_parameter("3.3", "optimize",
532530
alternative="pil_kwargs={'optimize': ...}")
533531
@cbook._delete_parameter("3.3", "progressive",
534532
alternative="pil_kwargs={'progressive': ...}")
535-
def print_jpg(self, filename_or_obj, *args, dryrun=False, pil_kwargs=None,
536-
**kwargs):
533+
def print_jpg(self, filename_or_obj, *args, pil_kwargs=None, **kwargs):
537534
"""
538535
Write the figure to a JPEG file.
539536
@@ -569,8 +566,6 @@ def print_jpg(self, filename_or_obj, *args, dryrun=False, pil_kwargs=None,
569566
FigureCanvasAgg.draw(self)
570567
finally:
571568
self.figure.set_facecolor((r, g, b, a))
572-
if dryrun:
573-
return
574569
if pil_kwargs is None:
575570
pil_kwargs = {}
576571
for k in ["quality", "optimize", "progressive"]:
@@ -594,11 +589,8 @@ def print_jpg(self, filename_or_obj, *args, dryrun=False, pil_kwargs=None,
594589
print_jpeg = print_jpg
595590

596591
@_check_savefig_extra_args
597-
@cbook._delete_parameter("3.2", "dryrun")
598-
def print_tif(self, filename_or_obj, *, dryrun=False, pil_kwargs=None):
592+
def print_tif(self, filename_or_obj, *, pil_kwargs=None):
599593
FigureCanvasAgg.draw(self)
600-
if dryrun:
601-
return
602594
if pil_kwargs is None:
603595
pil_kwargs = {}
604596
pil_kwargs.setdefault("dpi", (self.figure.dpi, self.figure.dpi))

‎lib/matplotlib/backends/backend_gtk3.py

Lines changed: 0 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -752,57 +752,6 @@ def set_cursor(self, cursor):
752752

753753

754754
class ConfigureSubplotsGTK3(backend_tools.ConfigureSubplotsBase, Gtk.Window):
755-
@cbook.deprecated("3.2")
756-
@property
757-
def window(self):
758-
if not hasattr(self, "_window"):
759-
self._window = None
760-
return self._window
761-
762-
@window.setter
763-
@cbook.deprecated("3.2")
764-
def window(self, window):
765-
self._window = window
766-
767-
@cbook.deprecated("3.2")
768-
def init_window(self):
769-
if self.window:
770-
return
771-
self.window = Gtk.Window(title="Subplot Configuration Tool")
772-
773-
try:
774-
self.window.window.set_icon_from_file(window_icon)
775-
except Exception:
776-
# we presumably already logged a message on the
777-
# failure of the main plot, don't keep reporting
778-
pass
779-
780-
self.vbox = Gtk.Box()
781-
self.vbox.set_property("orientation", Gtk.Orientation.VERTICAL)
782-
self.window.add(self.vbox)
783-
self.vbox.show()
784-
self.window.connect('destroy', self.destroy)
785-
786-
toolfig = Figure(figsize=(6, 3))
787-
canvas = self.figure.canvas.__class__(toolfig)
788-
789-
toolfig.subplots_adjust(top=0.9)
790-
SubplotTool(self.figure, toolfig)
791-
792-
w = int(toolfig.bbox.width)
793-
h = int(toolfig.bbox.height)
794-
795-
self.window.set_default_size(w, h)
796-
797-
canvas.show()
798-
self.vbox.pack_start(canvas, True, True, 0)
799-
self.window.show()
800-
801-
@cbook.deprecated("3.2")
802-
def destroy(self, *args):
803-
self.window.destroy()
804-
self.window = None
805-
806755
def _get_canvas(self, fig):
807756
return self.canvas.__class__(fig)
808757

‎lib/matplotlib/backends/backend_macosx.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,6 @@ def draw(self):
6868

6969
# draw_idle is provided by _macosx.FigureCanvas
7070

71-
@cbook.deprecated("3.2", alternative="draw_idle()")
72-
def invalidate(self):
73-
return self.draw_idle()
74-
7571
def blit(self, bbox=None):
7672
self.draw_idle()
7773

‎lib/matplotlib/backends/backend_pgf.py

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -77,16 +77,6 @@ def get_preamble():
7777
re_mathsep = re.compile(NO_ESCAPE + r"\$")
7878

7979

80-
@cbook.deprecated("3.2")
81-
def repl_escapetext(m):
82-
return "\\" + m.group(1)
83-
84-
85-
@cbook.deprecated("3.2")
86-
def repl_mathdefault(m):
87-
return m.group(0)[:-len(m.group(1))]
88-
89-
9080
_replace_escapetext = functools.partial(
9181
# When the next character is _, ^, $, or % (not preceded by an escape),
9282
# insert a backslash.
@@ -426,16 +416,12 @@ def __init__(self, figure, fh, dummy=False):
426416
self.figure = figure
427417
self.image_counter = 0
428418

429-
self._latexManager = LatexManager._get_cached_or_new() # deprecated
430-
431419
if dummy:
432420
# dummy==True deactivate all methods
433421
for m in RendererPgf.__dict__:
434422
if m.startswith("draw_"):
435423
self.__dict__[m] = lambda *args, **kwargs: None
436424

437-
latexManager = cbook._deprecate_privatize_attribute("3.2")
438-
439425
def draw_markers(self, gc, marker_path, marker_trans, path, trans,
440426
rgbFace=None):
441427
# docstring inherited
@@ -803,14 +789,7 @@ def get_default_filetype(self):
803789
return 'pdf'
804790

805791
@_check_savefig_extra_args
806-
@cbook._delete_parameter("3.2", "dryrun")
807-
def _print_pgf_to_fh(self, fh, *,
808-
dryrun=False, bbox_inches_restore=None):
809-
810-
if dryrun:
811-
renderer = RendererPgf(self.figure, None, dummy=True)
812-
self.figure.draw(renderer)
813-
return
792+
def _print_pgf_to_fh(self, fh, *, bbox_inches_restore=None):
814793

815794
header_text = """%% Creator: Matplotlib, PGF backend
816795
%%
@@ -875,9 +854,6 @@ def print_pgf(self, fname_or_fh, *args, **kwargs):
875854
Output pgf macros for drawing the figure so it can be included and
876855
rendered in latex documents.
877856
"""
878-
if kwargs.get("dryrun", False):
879-
self._print_pgf_to_fh(None, *args, **kwargs)
880-
return
881857
with cbook.open_file_cm(fname_or_fh, "w", encoding="utf-8") as file:
882858
if not cbook.file_requires_unicode(file):
883859
file = codecs.getwriter("utf-8")(file)
@@ -933,9 +909,6 @@ def _print_pdf_to_fh(self, fh, *args, metadata=None, **kwargs):
933909

934910
def print_pdf(self, fname_or_fh, *args, **kwargs):
935911
"""Use LaTeX to compile a Pgf generated figure to PDF."""
936-
if kwargs.get("dryrun", False):
937-
self._print_pgf_to_fh(None, *args, **kwargs)
938-
return
939912
with cbook.open_file_cm(fname_or_fh, "wb") as file:
940913
self._print_pdf_to_fh(file, *args, **kwargs)
941914

@@ -961,9 +934,6 @@ def _print_png_to_fh(self, fh, *args, **kwargs):
961934

962935
def print_png(self, fname_or_fh, *args, **kwargs):
963936
"""Use LaTeX to compile a pgf figure to pdf and convert it to png."""
964-
if kwargs.get("dryrun", False):
965-
self._print_pgf_to_fh(None, *args, **kwargs)
966-
return
967937
with cbook.open_file_cm(fname_or_fh, "wb") as file:
968938
self._print_png_to_fh(file, *args, **kwargs)
969939

‎lib/matplotlib/backends/backend_ps.py

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -828,11 +828,10 @@ def _print_ps(
828828
orientation=orientation, papertype=papertype, **kwargs)
829829

830830
@_check_savefig_extra_args
831-
@cbook._delete_parameter("3.2", "dryrun")
832831
def _print_figure(
833832
self, outfile, format, *,
834833
dpi, dsc_comments, orientation, papertype,
835-
dryrun=False, bbox_inches_restore=None):
834+
bbox_inches_restore=None):
836835
"""
837836
Render the figure to a filesystem path or a file-like object.
838837
@@ -880,14 +879,7 @@ def _print_figure(
880879
rotation = 90
881880
bbox = (llx, lly, urx, ury)
882881

883-
if dryrun:
884-
class NullWriter:
885-
def write(self, *args, **kwargs):
886-
pass
887-
888-
self._pswriter = NullWriter()
889-
else:
890-
self._pswriter = StringIO()
882+
self._pswriter = StringIO()
891883

892884
# mixed mode rendering
893885
ps_renderer = RendererPS(width, height, self._pswriter, imagedpi=dpi)
@@ -897,9 +889,6 @@ def write(self, *args, **kwargs):
897889

898890
self.figure.draw(renderer)
899891

900-
if dryrun: # return immediately if dryrun (tightbbox=True)
901-
return
902-
903892
def print_figure_impl(fh):
904893
# write the PostScript headers
905894
if is_eps:
@@ -1006,11 +995,10 @@ def print_figure_impl(fh):
1006995
print_figure_impl(fh)
1007996

1008997
@_check_savefig_extra_args
1009-
@cbook._delete_parameter("3.2", "dryrun")
1010998
def _print_figure_tex(
1011999
self, outfile, format, *,
10121000
dpi, dsc_comments, orientation, papertype,
1013-
dryrun=False, bbox_inches_restore=None):
1001+
bbox_inches_restore=None):
10141002
"""
10151003
If :rc:`text.usetex` is True, a temporary pair of tex/eps files
10161004
are created to allow tex to manage the text layout via the PSFrags
@@ -1030,14 +1018,7 @@ def _print_figure_tex(
10301018
ury = lly + self.figure.bbox.height
10311019
bbox = (llx, lly, urx, ury)
10321020

1033-
if dryrun:
1034-
class NullWriter:
1035-
def write(self, *args, **kwargs):
1036-
pass
1037-
1038-
self._pswriter = NullWriter()
1039-
else:
1040-
self._pswriter = StringIO()
1021+
self._pswriter = StringIO()
10411022

10421023
# mixed mode rendering
10431024
ps_renderer = RendererPS(width, height, self._pswriter, imagedpi=dpi)
@@ -1047,9 +1028,6 @@ def write(self, *args, **kwargs):
10471028

10481029
self.figure.draw(renderer)
10491030

1050-
if dryrun: # return immediately if dryrun (tightbbox=True)
1051-
return
1052-
10531031
# write to a temp file, we'll move it to outfile when done
10541032
with TemporaryDirectory() as tmpdir:
10551033
tmpfile = os.path.join(tmpdir, "tmp.ps")

‎lib/matplotlib/backends/backend_wx.py

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -957,11 +957,6 @@ def __init__(self, num, fig):
957957

958958
self.Bind(wx.EVT_CLOSE, self._onClose)
959959

960-
@cbook.deprecated("3.2", alternative="self.GetStatusBar()")
961-
@property
962-
def statusbar(self):
963-
return self.GetStatusBar()
964-
965960
@property
966961
def toolmanager(self):
967962
return self.figmgr.toolmanager
@@ -1308,16 +1303,6 @@ def draw_rubberband(self, event, x0, y0, x1, y1):
13081303
dc.SetBrush(wx.Brush(color))
13091304
dc.DrawRectangle(rect)
13101305

1311-
@cbook.deprecated("3.2")
1312-
def set_status_bar(self, statbar):
1313-
self.GetTopLevelParent().SetStatusBar(statbar)
1314-
1315-
@cbook.deprecated("3.2",
1316-
alternative="self.GetTopLevelParent().GetStatusBar()")
1317-
@property
1318-
def statbar(self):
1319-
return self.GetTopLevelParent().GetStatusBar()
1320-
13211306
def set_message(self, s):
13221307
if self._coordinates:
13231308
self._label_text.SetLabel(s)
@@ -1451,27 +1436,6 @@ def trigger(self, *args):
14511436
NavigationToolbar2Wx.configure_subplots(
14521437
self._make_classic_style_pseudo_toolbar())
14531438

1454-
@cbook.deprecated("3.2")
1455-
def configure_subplots(self):
1456-
frame = wx.Frame(None, -1, "Configure subplots")
1457-
_set_frame_icon(frame)
1458-
1459-
toolfig = Figure((6, 3))
1460-
canvas = self.get_canvas(frame, toolfig)
1461-
1462-
# Now put all into a sizer
1463-
sizer = wx.BoxSizer(wx.VERTICAL)
1464-
# This way of adding to sizer allows resizing
1465-
sizer.Add(canvas, 1, wx.LEFT | wx.TOP | wx.GROW)
1466-
frame.SetSizer(sizer)
1467-
frame.Fit()
1468-
SubplotTool(self.canvas.figure, toolfig)
1469-
frame.Show()
1470-
1471-
@cbook.deprecated("3.2")
1472-
def get_canvas(self, frame, fig):
1473-
return type(self.canvas)(frame, -1, fig)
1474-
14751439

14761440
class SaveFigureWx(backend_tools.SaveFigureBase):
14771441
def trigger(self, *args):

0 commit comments

Comments
 (0)