diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py index caf773a1e518..b3b3c59cb2b7 100644 --- a/lib/matplotlib/backend_bases.py +++ b/lib/matplotlib/backend_bases.py @@ -33,7 +33,6 @@ """ from contextlib import contextmanager -from functools import partial import importlib import io import os diff --git a/lib/matplotlib/backends/backend_agg.py b/lib/matplotlib/backends/backend_agg.py index 2c5faab43e24..ca7a44700bcd 100644 --- a/lib/matplotlib/backends/backend_agg.py +++ b/lib/matplotlib/backends/backend_agg.py @@ -28,7 +28,7 @@ from math import radians, cos, sin from matplotlib import cbook, rcParams, __version__ from matplotlib.backend_bases import ( - _Backend, FigureCanvasBase, FigureManagerBase, RendererBase, cursors) + _Backend, FigureCanvasBase, FigureManagerBase, RendererBase) from matplotlib.font_manager import findfont, get_font from matplotlib.ft2font import (LOAD_FORCE_AUTOHINT, LOAD_NO_HINTING, LOAD_DEFAULT, LOAD_NO_AUTOHINT) @@ -418,15 +418,11 @@ def draw(self): toolbar = self.toolbar try: - # if toolbar: - # toolbar.set_cursor(cursors.WAIT) self.figure.draw(self.renderer) # A GUI class may be need to update a window using this draw, so # don't forget to call the superclass. super().draw() finally: - # if toolbar: - # toolbar.set_cursor(toolbar._lastCursor) RendererAgg.lock.release() def get_renderer(self, cleared=False): diff --git a/lib/matplotlib/backends/backend_wxagg.py b/lib/matplotlib/backends/backend_wxagg.py index 054c87d72630..52b338f5538a 100644 --- a/lib/matplotlib/backends/backend_wxagg.py +++ b/lib/matplotlib/backends/backend_wxagg.py @@ -1,6 +1,5 @@ import wx -import matplotlib from .backend_agg import FigureCanvasAgg from .backend_wx import ( _BackendWx, _FigureCanvasWxBase, FigureFrameWx, diff --git a/lib/matplotlib/font_manager.py b/lib/matplotlib/font_manager.py index 791a70087382..16a21f05461f 100644 --- a/lib/matplotlib/font_manager.py +++ b/lib/matplotlib/font_manager.py @@ -31,7 +31,6 @@ # - 'light' is an invalid weight value, remove it. # - update_fonts not implemented -from collections import Iterable from functools import lru_cache import json import logging diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py index 1b92692e2f94..594154b5e088 100644 --- a/lib/matplotlib/rcsetup.py +++ b/lib/matplotlib/rcsetup.py @@ -17,11 +17,10 @@ from functools import reduce import operator import os -import warnings import re from matplotlib import cbook -from matplotlib.cbook import mplDeprecation, deprecated, ls_mapper +from matplotlib.cbook import ls_mapper from matplotlib.fontconfig_pattern import parse_fontconfig_pattern from matplotlib.colors import is_color_like diff --git a/lib/matplotlib/sphinxext/plot_directive.py b/lib/matplotlib/sphinxext/plot_directive.py index eae97820bf6e..47e507b4cded 100644 --- a/lib/matplotlib/sphinxext/plot_directive.py +++ b/lib/matplotlib/sphinxext/plot_directive.py @@ -155,7 +155,6 @@ import jinja2 # Sphinx dependency. import matplotlib -import matplotlib.cbook as cbook try: with warnings.catch_warnings(record=True): warnings.simplefilter("error", UserWarning) diff --git a/lib/matplotlib/tests/test_colors.py b/lib/matplotlib/tests/test_colors.py index 78febfbc2d0d..bbbc712c7399 100644 --- a/lib/matplotlib/tests/test_colors.py +++ b/lib/matplotlib/tests/test_colors.py @@ -1,6 +1,5 @@ import copy import itertools -import warnings import numpy as np import pytest diff --git a/lib/matplotlib/tests/test_constrainedlayout.py b/lib/matplotlib/tests/test_constrainedlayout.py index 7e922a7b9383..07950ee38bf5 100644 --- a/lib/matplotlib/tests/test_constrainedlayout.py +++ b/lib/matplotlib/tests/test_constrainedlayout.py @@ -1,12 +1,8 @@ -import warnings - import numpy as np import pytest from matplotlib.testing.decorators import image_comparison import matplotlib.pyplot as plt -from matplotlib.offsetbox import AnchoredOffsetbox, DrawingArea -from matplotlib.patches import Rectangle import matplotlib.gridspec as gridspec from matplotlib import ticker, rcParams diff --git a/lib/matplotlib/ticker.py b/lib/matplotlib/ticker.py index 3cd7559af9af..8adfbabfcccb 100644 --- a/lib/matplotlib/ticker.py +++ b/lib/matplotlib/ticker.py @@ -172,7 +172,6 @@ from matplotlib import rcParams from matplotlib import cbook from matplotlib import transforms as mtransforms -from matplotlib.cbook import mplDeprecation import warnings diff --git a/lib/mpl_toolkits/axisartist/axis_artist.py b/lib/mpl_toolkits/axisartist/axis_artist.py index 1eb91ff3af65..5ce41173442f 100644 --- a/lib/mpl_toolkits/axisartist/axis_artist.py +++ b/lib/mpl_toolkits/axisartist/axis_artist.py @@ -101,8 +101,6 @@ from matplotlib.artist import allow_rasterization -import warnings - import numpy as np @@ -226,7 +224,6 @@ def __init__(self, ticksize, tick_out=False, *, axis=None, **kwargs): self.set_snap(True) def get_ref_artist(self): - #return self._ref_artist.get_ticklines()[0] return self._ref_artist.majorTicks[0].tick1line def get_color(self): @@ -286,25 +283,6 @@ def draw(self, renderer): size = self._ticksize path_trans = self.get_transform() - # set gc : copied from lines.py -# gc = renderer.new_gc() -# self._set_gc_clip(gc) - -# gc.set_foreground(self.get_color()) -# gc.set_antialiased(self._antialiased) -# gc.set_linewidth(self._linewidth) -# gc.set_alpha(self._alpha) -# if self.is_dashed(): -# cap = self._dashcapstyle -# join = self._dashjoinstyle -# else: -# cap = self._solidcapstyle -# join = self._solidjoinstyle -# gc.set_joinstyle(join) -# gc.set_capstyle(cap) -# gc.set_snap(self.get_snap()) - - gc = renderer.new_gc() gc.set_foreground(self.get_markeredgecolor()) gc.set_linewidth(self.get_markeredgewidth()) @@ -348,7 +326,6 @@ def __init__(self, *kl, **kwargs): self.set_rotation_mode("anchor") self._text_follow_ref_angle = True - #self._offset_ref_angle = 0 def _set_ref_angle(self, a): self._ref_angle = a @@ -404,14 +381,12 @@ def draw(self, renderer): super().draw(renderer) offset_tr.clear() - # restore original properties self.set_transform(tr) self.set_rotation(angle_orig) def get_window_extent(self, renderer): - self._update(renderer) # save original and adjust some properties @@ -434,7 +409,6 @@ def get_window_extent(self, renderer): offset_tr.clear() - # restore original properties self.set_transform(tr) self.set_rotation(angle_orig) @@ -507,7 +481,6 @@ def get_text(self): top=("bottom", "center")) - def set_default_alignment(self, d): if d not in ["left", "right", "top", "bottom"]: raise ValueError('direction must be on of "left", "right", "top", "bottom"') @@ -598,9 +571,7 @@ class TickLabels(AxisLabel, AttributeCopier): # mtext.Text def __init__(self, *, axis_direction="bottom", **kwargs): AxisLabel.__init__(self, **kwargs) self.set_axis_direction(axis_direction) - #self._axis_direction = axis_direction self._axislabel_pad = 0 - #self._extra_pad = 0 # attribute copier def get_ref_artist(self): @@ -692,25 +663,17 @@ def _get_ticklabels_offsets(self, renderer, label_direction): r = max_descent pad = max_ascent + max_descent - #tick_pad = renderer.points_to_pixels(self.get_pad()) - # r : offset - # pad : total height of the ticklabels. This will be used to # calculate the pad for the axislabel. return r, pad - _default_alignments = dict(left=("center", "right"), right=("center", "left"), bottom=("baseline", "center"), top=("baseline", "center")) - - - # set_default_alignments(self, d) - _default_angles = dict(left=90, right=-90, bottom=0, @@ -725,13 +688,10 @@ def draw(self, renderer): r, total_width = self._get_ticklabels_offsets(renderer, self._axis_direction) - #self._set_external_pad(r+self._get_external_pad()) pad = self._get_external_pad() + \ renderer.points_to_pixels(self.get_pad()) self._set_offset_radius(r+pad) - #self._set_offset_radius(r) - for (x, y), a, l in self._locs_angles_labels: if not l.strip(): continue @@ -824,8 +784,6 @@ def draw(self, renderer): super().draw(renderer) - - class AxisArtist(martist.Artist): """ An artist which draws axis (a line along which the n-th axes coord @@ -871,8 +829,6 @@ def __init__(self, axes, self._minortick_visible = True self._minorticklabel_visible = True - - #if self._axis_artist_helper._loc in ["left", "right"]: if axis_direction in ["left", "right"]: axis_name = "ytick" self.axis = axes.yaxis @@ -880,13 +836,9 @@ def __init__(self, axes, axis_name = "xtick" self.axis = axes.xaxis - self._axisline_style = None - - self._axis_direction = axis_direction - self._init_line() self._init_ticks(axis_name, **kw) self._init_offsetText(axis_direction) @@ -939,26 +891,15 @@ def set_axis_direction(self, axis_direction): raise ValueError('direction must be on of "left", "right", "top", "bottom"') self._axis_direction = axis_direction if axis_direction in ["left", "top"]: - #self._set_tick_direction("+") self.set_ticklabel_direction("-") self.set_axislabel_direction("-") else: - #self._set_tick_direction("-") self.set_ticklabel_direction("+") self.set_axislabel_direction("+") self.major_ticklabels.set_axis_direction(axis_direction) self.label.set_axis_direction(axis_direction) - # def _set_tick_direction(self, d): - # if d not in ["+", "-"]: - # raise ValueError('direction must be on of "in", "out"') - - # if d == "+": - # self._tick_add_angle = 0 #get_helper()._extremes=0, 10 - # else: - # self._tick_add_angle = 180 #get_helper()._extremes=0, 10 - def set_ticklabel_direction(self, tick_direction): """ Adjust the direction of the ticklabel. @@ -982,10 +923,6 @@ def invert_ticklabel_direction(self): self.major_ticklabels.invert_axis_direction() self.minor_ticklabels.invert_axis_direction() - # def invert_ticks_direction(self): - # self.major_ticks.set_tick_out(not self.major_ticks.get_tick_out()) - # self.minor_ticks.set_tick_out(not self.minor_ticks.get_tick_out()) - def set_axislabel_direction(self, label_direction): """ Adjust the direction of the axislabel. @@ -1004,7 +941,6 @@ def set_axislabel_direction(self, label_direction): self._axislabel_add_angle = 0 - def get_transform(self): return self.axes.transAxes + self.offset_transform @@ -1040,7 +976,6 @@ def set_axisline_style(self, axisline_style=None, **kw): else: self._axisline_style = AxislineStyle(axisline_style, **kw) - self._init_line() @@ -1078,7 +1013,6 @@ def _init_ticks(self, axis_name, **kw): trans=self._axis_artist_helper.get_tick_transform(self.axes) \ + self.offset_transform - major_tick_size = kw.get("major_tick_size", rcParams['%s.major.size'%axis_name]) major_tick_pad = kw.get("major_tick_pad", @@ -1100,7 +1034,6 @@ def _init_ticks(self, axis_name, **kw): else: size = rcParams['ytick.labelsize'] - fontprops = font_manager.FontProperties(size=size) self.major_ticklabels = TickLabels(size=size, axis=self.axis, @@ -1108,7 +1041,6 @@ def _init_ticks(self, axis_name, **kw): self.minor_ticklabels = TickLabels(size=size, axis=self.axis, axis_direction=self._axis_direction) - self.major_ticklabels.set(figure = self.axes.figure, transform=trans, fontproperties=fontprops) @@ -1120,7 +1052,6 @@ def _init_ticks(self, axis_name, **kw): self.minor_ticklabels.set_pad(minor_tick_pad) - def _get_tick_info(self, tick_iter): """ return ticks_loc_angle, ticklabels_loc_angle_label @@ -1131,7 +1062,6 @@ def _get_tick_info(self, tick_iter): ticks_loc_angle = [] ticklabels_loc_angle_label = [] - tick_add_angle = self._tick_add_angle ticklabel_add_angle = self._ticklabel_add_angle for loc, angle_normal, angle_tangent, label in tick_iter: @@ -1150,8 +1080,6 @@ def _get_tick_info(self, tick_iter): def _update_ticks(self, renderer): - - # set extra pad for major and minor ticklabels: # use ticksize of majorticks even for minor ticks. not clear what is best. @@ -1173,10 +1101,6 @@ def _update_ticks(self, renderer): self.major_ticks.set_locs_angles(tick_loc_angle) self.major_ticklabels.set_locs_angles_labels(ticklabel_loc_angle_label) - #self.major_ticks.draw(renderer) - #self.major_ticklabels.draw(renderer) - - # minor ticks tick_loc_angle, ticklabel_loc_angle_label \ = self._get_tick_info(minortick_iter) @@ -1184,13 +1108,6 @@ def _update_ticks(self, renderer): self.minor_ticks.set_locs_angles(tick_loc_angle) self.minor_ticklabels.set_locs_angles_labels(ticklabel_loc_angle_label) - #self.minor_ticks.draw(renderer) - #self.minor_ticklabels.draw(renderer) - - - #if (self.major_ticklabels.get_visible() or self.minor_ticklabels.get_visible()): - # self._draw_offsetText(renderer) - return self.major_ticklabels.get_window_extents(renderer) @@ -1269,7 +1186,6 @@ def _init_offsetText(self, direction): self.offsetText = mtext.Annotation("", xy=(x,y), xycoords="axes fraction", xytext=(0,0), textcoords="offset points", - #fontproperties = fp, color = rcParams['xtick.color'], verticalalignment=va, horizontalalignment=ha, @@ -1292,24 +1208,17 @@ def _draw_offsetText(self, renderer): def _init_label(self, **kw): - # x in axes coords, y in display coords (to be updated at draw - # time by _update_label_positions) - labelsize = kw.get("labelsize", rcParams['axes.labelsize']) - #labelcolor = kw.get("labelcolor", - # rcParams['axes.labelcolor']) fontprops = font_manager.FontProperties( size=labelsize, weight=rcParams['axes.labelweight']) - textprops = dict(fontproperties = fontprops) - #color = labelcolor) tr = self._axis_artist_helper.get_axislabel_transform(self.axes) \ + self.offset_transform self.label = AxisLabel(0, 0, "__from_axes__", - color = "auto", #rcParams['axes.labelcolor'], + color = "auto", fontproperties=fontprops, axis=self.axis, transform=tr, @@ -1323,17 +1232,9 @@ def _init_label(self, **kw): def _update_label(self, renderer): - if not self.label.get_visible(): return - fontprops = font_manager.FontProperties( - size=rcParams['axes.labelsize'], - weight=rcParams['axes.labelweight']) - - #pad_points = self.major_tick_pad - - #if abs(self._ticklabel_add_angle - self._axislabel_add_angle)%360 > 90: if self._ticklabel_add_angle != self._axislabel_add_angle: if (self.major_ticks.get_visible() and not self.major_ticks.get_tick_out()) \ or \ @@ -1345,10 +1246,6 @@ def _update_label(self, renderer): axislabel_pad = max(self.major_ticklabels._axislabel_pad, self.minor_ticklabels._axislabel_pad) - - #label_offset = axislabel_pad + self.LABELPAD - - #self.label._set_offset_radius(label_offset) self.label._set_external_pad(axislabel_pad) xy, angle_tangent = self._axis_artist_helper.get_axislabel_pos_angle(self.axes) @@ -1356,7 +1253,6 @@ def _update_label(self, renderer): angle_label = angle_tangent - 90 - x, y = xy self.label._set_ref_angle(angle_label+self._axislabel_add_angle) self.label.set(x=x, y=y) @@ -1367,7 +1263,6 @@ def _draw_label(self, renderer): self.label.draw(renderer) def _draw_label2(self, renderer): - if not self.label.get_visible(): return @@ -1375,9 +1270,6 @@ def _draw_label2(self, renderer): size=rcParams['axes.labelsize'], weight=rcParams['axes.labelweight']) - #pad_points = self.major_tick_pad - - #if abs(self._ticklabel_add_angle - self._axislabel_add_angle)%360 > 90: if self._ticklabel_add_angle != self._axislabel_add_angle: if (self.major_ticks.get_visible() and not self.major_ticks.get_tick_out()) \ or \ @@ -1389,9 +1281,6 @@ def _draw_label2(self, renderer): axislabel_pad = max(self.major_ticklabels._axislabel_pad, self.minor_ticklabels._axislabel_pad) - #label_offset = axislabel_pad + self.LABELPAD - - #self.label._set_offset_radius(label_offset) self.label._set_external_pad(axislabel_pad) xy, angle_tangent = self._axis_artist_helper.get_axislabel_pos_angle(self.axes) @@ -1405,12 +1294,10 @@ def _draw_label2(self, renderer): self.label.draw(renderer) - def set_label(self, s): self.label.set_text(s) - def get_tightbbox(self, renderer): if not self.get_visible(): return @@ -1419,20 +1306,15 @@ def get_tightbbox(self, renderer): dpi_cor = renderer.points_to_pixels(1.) self.dpi_transform.clear().scale(dpi_cor, dpi_cor) - bb = [] self._update_ticks(renderer) - #if self.major_ticklabels.get_visible(): bb.extend(self.major_ticklabels.get_window_extents(renderer)) - #if self.minor_ticklabels.get_visible(): bb.extend(self.minor_ticklabels.get_window_extents(renderer)) - self._update_label(renderer) - #if self.label.get_visible(): bb.append(self.label.get_window_extent(renderer)) bb.append(self.offsetText.get_window_extent(renderer)) @@ -1443,14 +1325,6 @@ def get_tightbbox(self, renderer): else: return None - #self._draw_line(renderer) - - #self._draw_ticks(renderer) - - #self._draw_offsetText(renderer) - #self._draw_label(renderer) - - @allow_rasterization def draw(self, renderer): @@ -1465,19 +1339,12 @@ def draw(self, renderer): dpi_cor = renderer.points_to_pixels(1.) self.dpi_transform.clear().scale(dpi_cor, dpi_cor) - self._draw_ticks(renderer) - self._draw_line(renderer) - - #self._draw_offsetText(renderer) self._draw_label(renderer) renderer.close_group(__name__) - #def get_ticklabel_extents(self, renderer): - # pass - def toggle(self, all=None, ticks=None, ticklabels=None, label=None): """ Toggle visibility of ticks, ticklabels, and (axis) label.