8000 Cleanup unused imports and variables in backends (#22502) · matplotlib/matplotlib@581bf5d · GitHub
[go: up one dir, main page]

Skip to content

Commit 581bf5d

Browse files
authored
Cleanup unused imports and variables in backends (#22502)
1 parent 826e685 commit 581
8000
bf5d

17 files changed

+35
-38
lines changed

lib/matplotlib/backends/backend_agg.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,9 @@
2929
from math import radians, cos, sin
3030

3131
import numpy as np
32-
from PIL import Image
3332

3433
import matplotlib as mpl
3534
from matplotlib import _api, cbook
36-
from matplotlib import colors as mcolors
3735
from matplotlib.backend_bases import (
3836
_Backend, FigureCanvasBase, FigureManagerBase, RendererBase)
3937
from matplotlib.font_manager import findfont, get_font
@@ -152,7 +150,7 @@ def draw_path(self, gc, path, transform, rgbFace=None):
152150
p.simplify_threshold = path.simplify_threshold
153151
try:
154152
self._renderer.draw_path(gc, p, transform, rgbFace)
155-
except OverflowError as err:
153+
except OverflowError:
156154
msg = (
157155
"Exceeded cell block limit in Agg.\n\n"
158156
"Please reduce the value of "
@@ -167,7 +165,7 @@ def draw_path(self, gc, path, transform, rgbFace=None):
167165
else:
168166
try:
169167
self._renderer.draw_path(gc, path, transform, rgbFace)
170-
except OverflowError as err:
168+
except OverflowError:
171169
cant_chunk = ''
172170
if rgbFace is not None:
173171
cant_chunk += "- can not split filled path\n"

lib/matplotlib/backends/backend_gtk3.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
from matplotlib import _api, backend_tools, cbook
99
from matplotlib.backend_bases import FigureCanvasBase, ToolContainerBase
1010
from matplotlib.backend_tools import Cursors
11-
from matplotlib.figure import Figure
1211

1312
try:
1413
import gi
@@ -27,9 +26,10 @@
2726
from gi.repository import Gio, GLib, GObject, Gtk, Gdk
2827
from . import _backend_gtk
2928
from ._backend_gtk import (
30-
backend_version, _BackendGTK, _FigureManagerGTK, _NavigationToolbar2GTK,
29+
_BackendGTK, _FigureManagerGTK, _NavigationToolbar2GTK,
3130
TimerGTK as TimerGTK3,
3231
)
32+
from ._backend_gtk import backend_version # noqa: F401 # pylint: disable=W0611
3333

3434

3535
_log = logging.getLogger(__name__)
@@ -50,7 +50,7 @@ def cursord(self):
5050
Cursors.SELECT_REGION: new_cursor("crosshair"),
5151
Cursors.WAIT: new_cursor("wait"),
5252
}
53-
except TypeError as exc:
53+
except TypeError:
5454
return {}
5555

5656
icon_filename = _api.deprecated("3.6", obj_type="")(property(

lib/matplotlib/backends/backend_gtk4.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import functools
22
import io
33
import os
4-
from pathlib import Path
54

65
import matplotlib as mpl
76
from matplotlib import _api, backend_tools, cbook
@@ -24,9 +23,10 @@
2423
from gi.repository import Gio, GLib, GObject, Gtk, Gdk, GdkPixbuf
2524
from . import _backend_gtk
2625
from ._backend_gtk import (
27-
backend_version, _BackendGTK, _FigureManagerGTK, _NavigationToolbar2GTK,
26+
_BackendGTK, _FigureManagerGTK, _NavigationToolbar2GTK,
2827
TimerGTK as TimerGTK4,
2928
)
29+
from .backend_gtk import backend_version # noqa: F401 # pylint: disable=W0611
3030

3131

3232
class FigureCanvasGTK4(Gtk.DrawingArea, FigureCanvasBase):

lib/matplotlib/backends/backend_macosx.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import matplotlib as mpl
22
from matplotlib import cbook
33
from matplotlib._pylab_helpers import Gcf
4-
from matplotlib.backends import _macosx
5-
from matplotlib.backends.backend_agg import FigureCanvasAgg
4+
from . import _macosx
5+
from .backend_agg import FigureCanvasAgg
66
from matplotlib.backend_bases import (
77
_Backend, FigureCanvasBase, FigureManagerBase, NavigationToolbar2,
88
TimerBase)

lib/matplotlib/backends/backend_mixed.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import numpy as np
22

33
from matplotlib import cbook
4-
from matplotlib.backends.backend_agg import RendererAgg
4+
from .backend_agg import RendererAgg
55
from matplotlib._tight_bbox import process_figure_for_rasterizing
66

77

lib/matplotlib/backends/backend_nbagg.py

Lines changed: 4 additions & 4 deletions 10000
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
from matplotlib import is_interactive
2121
from matplotlib._pylab_helpers import Gcf
2222
from matplotlib.backend_bases import _Backend, NavigationToolbar2
23-
from matplotlib.backends.backend_webagg_core import (
24-
FigureCanvasWebAggCore, FigureManagerWebAgg, NavigationToolbar2WebAgg,
25-
TimerTornado, TimerAsyncio
26-
)
23+
from .backend_webagg_core import (
24+
FigureCanvasWebAggCore, FigureManagerWebAgg, NavigationToolbar2WebAgg)
25+
from .backend_webagg_core import ( # noqa: F401 # pylint: disable=W0611
26+
TimerTornado, TimerAsyncio)
2727

2828

2929
def connection_info():

lib/matplotlib/backends/backend_pgf.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@
1818
import matplotlib as mpl
1919
from matplotlib import _api, cbook, font_manager as fm
2020
from matplotlib.backend_bases import (
21-
_Backend, FigureCanvasBase, FigureManagerBase, GraphicsContextBase,
22-
RendererBase
21+
_Backend, FigureCanvasBase, FigureManagerBase, RendererBase
2322
)
2423
from matplotlib.backends.backend_mixed import MixedModeRenderer
2524
from matplotlib.backends.backend_pdf import (

lib/matplotlib/backends/backend_qt.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -405,8 +405,7 @@ def start_event_loop(self, timeout=0):
405405
raise RuntimeError("Event loop already running")
406406
self._event_loop = event_loop = QtCore.QEventLoop()
407407
if timeout > 0:
408-
timer = QtCore.QTimer.singleShot(int(timeout * 1000),
409-
event_loop.quit)
408+
_ = QtCore.QTimer.singleShot(int(timeout * 1000), event_loop.quit)
410409

411410
with _maybe_allow_interrupt(event_loop):
412411
qt_compat._exec(event_loop)

lib/matplotlib/backends/backend_qt5agg.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
Render to qt from agg
33
"""
44

5-
from .backend_qtagg import (
6-
_BackendQTAgg, FigureCanvasQTAgg, FigureManagerQT, NavigationToolbar2QT,
5+
from .backend_qtagg import _BackendQTAgg
6+
from .backend_qtagg import ( # noqa: F401 # pylint: disable=W0611
7+
FigureCanvasQTAgg, FigureManagerQT, NavigationToolbar2QT,
78
backend_version, FigureCanvasAgg, FigureCanvasQT
89
)
910

lib/matplotlib/backends/backend_qt5cairo.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
from .backend_qtcairo import (
2-
_BackendQTCairo, FigureCanvasQTCairo, FigureCanvasCairo, FigureCanvasQT)
1+
from .backend_qtcairo import _BackendQTCairo
2+
from .backend_qtcairo import ( # noqa: F401 # pylint: disable=W0611
3+
FigureCanvasQTCairo, FigureCanvasCairo, FigureCanvasQT)
34

45

56
@_BackendQTCairo.export

lib/matplotlib/backends/backend_qtagg.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
from .qt_compat import QT_API, _enum, _setDevicePixelRatio
1010
from .. import cbook
1111
from .backend_agg import FigureCanvasAgg
12-
from .backend_qt import (
13-
QtCore, QtGui, QtWidgets, _BackendQT, FigureCanvasQT, FigureManagerQT,
14-
NavigationToolbar2QT, backend_version)
12+
from .backend_qt import QtCore, QtGui, _BackendQT, FigureCanvasQT
13+
from .backend_qt import ( # noqa: F401 # pylint: disable=W0611
14+
FigureManagerQT, NavigationToolbar2QT, backend_version)
1515

1616

1717
class FigureCanvasQTAgg(FigureCanvasAgg, FigureCanvasQT):

lib/matplotlib/backends/backend_tkagg.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
from . import _backend_tk
22
from .backend_agg import FigureCanvasAgg
3-
from ._backend_tk import (
4-
_BackendTk, FigureCanvasTk, FigureManagerTk, NavigationToolbar2Tk)
3+
from ._backend_tk import _BackendTk, FigureCanvasTk
4+
from ._backend_tk import ( # noqa: F401 # pylint: disable=W0611
5+
FigureManagerTk, NavigationToolbar2Tk)
56

67

78
class FigureCanvasTkAgg(FigureCanvasAgg, FigureCanvasTk):

lib/matplotlib/backends/backend_webagg.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@
3636
from matplotlib.backend_bases import _Backend
3737
from matplotlib._pylab_helpers import Gcf
3838
from . import backend_webagg_core as core
39-
from .backend_webagg_core import TimerAsyncio, TimerTornado
39+
from .backend_webagg_core import ( # noqa: F401 # pylint: disable=W0611
40+
TimerAsyncio, TimerTornado)
4041

4142

4243
class ServerThread(threading.Thread):

lib/matplotlib/backends/backend_wx.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,8 @@
2525

2626
from matplotlib import _api, cbook, backend_tools
2727
from matplotlib._pylab_helpers import Gcf
28-
from matplotlib.backend_managers import ToolManager
29-
from matplotlib.figure import Figure
3028
from matplotlib.path import Path
3129
from matplotlib.transforms import Affine2D
32-
from matplotlib.widgets import SubplotTool
3330

3431
import wx
3532

lib/matplotlib/backends/backend_wxagg.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
from .. import _api
44
from .backend_agg import FigureCanvasAgg
5-
from .backend_wx import (
6-
_BackendWx, _FigureCanvasWxBase, FigureFrameWx,
5+
from .backend_wx import _BackendWx, _FigureCanvasWxBase, FigureFrameWx
6+
from .backend_wx import ( # noqa: F401 # pylint: disable=W0611
77
NavigationToolbar2Wx as NavigationToolbar2WxAgg)
88

99

lib/matplotlib/backends/backend_wxcairo.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
from .. import _api
44
from .backend_cairo import cairo, FigureCanvasCairo
5-
from .backend_wx import (
6-
_BackendWx, _FigureCanvasWxBase, FigureFrameWx,
5+
from .backend_wx import _BackendWx, _FigureCanvasWxBase, FigureFrameWx
6+
from .backend_wx import ( # noqa: F401 # pylint: disable=W0611
77
NavigationToolbar2Wx as NavigationToolbar2WxCairo)
88

99

lib/matplotlib/backends/qt_compat.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
else:
7070
try:
7171
QT_API = _ETS[QT_API_ENV]
72-
except KeyError as err:
72+
except KeyError:
7373
raise RuntimeError(
7474
"The environment variable QT_API has the unrecognized value "
7575
f"{QT_API_ENV!r}; "

0 commit comments

Comments
 (0)
0