8000 Cleanup unused imports and variables in backends by oscargus · Pull Request #22502 · matplotlib/matplotlib · GitHub
[go: up one dir, main page]

Skip to content

Cleanup unused imports and variables in backends #22502

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 23, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions lib/matplotlib/backends/backend_agg.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,9 @@
from math import radians, cos, sin

import numpy as np
from PIL import Image

import matplotlib as mpl
from matplotlib import _api, cbook
from matplotlib import colors as mcolors
from matplotlib.backend_bases import (
_Backend, FigureCanvasBase, FigureManagerBase, RendererBase)
from matplotlib.font_manager import findfont, get_font
Expand Down Expand Up @@ -152,7 +150,7 @@ def draw_path(self, gc, path, transform, rgbFace=None):
p.simplify_threshold = path.simplify_threshold
try:
self._renderer.draw_path(gc, p, transform, rgbFace)
except OverflowError as err:
except OverflowError:
msg = (
"Exceeded cell block limit in Agg.\n\n"
"Please reduce the value of "
Expand All @@ -167,7 +165,7 @@ def draw_path(self, gc, path, transform, rgbFace=None):
else:
try:
self._renderer.draw_path(gc, path, transform, rgbFace)
except OverflowError as err:
except OverflowError:
cant_chunk = ''
if rgbFace is not None:
cant_chunk += "- can not split filled path\n"
Expand Down
6 changes: 3 additions & 3 deletions lib/matplotlib/backends/backend_gtk3.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
from matplotlib import _api, backend_tools, cbook
from matplotlib.backend_bases import FigureCanvasBase, ToolContainerBase
from matplotlib.backend_tools import Cursors
from matplotlib.figure import Figure

try:
import gi
Expand All @@ -27,9 +26,10 @@
from gi.repository import Gio, GLib, GObject, Gtk, Gdk
from . import _backend_gtk
from ._backend_gtk import (
backend_version, _BackendGTK, _FigureManagerGTK, _NavigationToolbar2GTK,
_BackendGTK, _FigureManagerGTK, _NavigationToolbar2GTK,
TimerGTK as TimerGTK3,
)
from ._backend_gtk import backend_version # noqa: F401 # pylint: disable=W0611


_log = logging.getLogger(__name__)
Expand All @@ -50,7 +50,7 @@ def cursord(self):
Cursors.SELECT_REGION: new_cursor("crosshair"),
Cursors.WAIT: new_cursor("wait"),
}
except TypeError as exc:
except TypeError:
return {}

icon_filename = _api.deprecated("3.6", obj_type="")(property(
Expand Down
4 changes: 2 additions & 2 deletions lib/matplotlib/backends/backend_gtk4.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import functools
import io
import os
from pathlib import Path

import matplotlib as mpl
from matplotlib import _api, backend_tools, cbook
Expand All @@ -24,9 +23,10 @@
from gi.repository import Gio, GLib, GObject, Gtk, Gdk, GdkPixbuf
from . import _backend_gtk
from ._backend_gtk import (
backend_version, _BackendGTK, _FigureManagerGTK, _NavigationToolbar2GTK,
_BackendGTK, _FigureManagerGTK, _NavigationToolbar2GTK,
TimerGTK as TimerGTK4,
)
from .backend_gtk import backend_version # noqa: F401 # pylint: disable=W0611


class FigureCanvasGTK4(Gtk.DrawingArea, FigureCanvasBase):
Expand Down
4 changes: 2 additions & 2 deletions lib/matplotlib/backends/backend_macosx.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import matplotlib as mpl
from matplotlib import cbook
from matplotlib._pylab_helpers import Gcf
from matplotlib.backends import _macosx
from matplotlib.backends.backend_agg import FigureCanvasAgg
from . import _macosx
from .backend_agg import FigureCanvasAgg
from matplotlib.backend_bases import (
_Backend, FigureCanvasBase, FigureManagerBase, NavigationToolbar2,
TimerBase)
Expand Down
2 changes: 1 addition & 1 deletion lib/matplotlib/backends/backend_mixed.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import numpy as np

from matplotlib import cbook
from matplotlib.backends.backend_agg import RendererAgg
from .backend_agg import RendererAgg
from matplotlib._tight_bbox import process_figure_for_rasterizing


Expand Down
8 changes: 4 additions & 4 deletions lib/matplotlib/backends/backend_nbagg.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
from matplotlib import is_interactive
from matplotlib._pylab_helpers import Gcf
from matplotlib.backend_bases import _Backend, NavigationToolbar2
from matplotlib.backends.backend_webagg_core import (
FigureCanvasWebAggCore, FigureManagerWebAgg, NavigationToolbar2WebAgg,
TimerTornado, TimerAsyncio
)
from .backend_webagg_core import (
FigureCanvasWebAggCore, FigureManagerWebAgg, NavigationToolbar2WebAgg)
from .backend_webagg_core import ( # noqa: F401 # pylint: disable=W0611
TimerTornado, TimerAsyncio)


def connection_info():
Expand Down
3 changes: 1 addition & 2 deletions lib/matplotlib/backends/backend_pgf.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@
import matplotlib as mpl
from matplotlib import _api, cbook, font_manager as fm
from matplotlib.backend_bases import (
_Backend, FigureCanvasBase, FigureManagerBase, GraphicsContextBase,
RendererBase
_Backend, FigureCanvasBase, FigureManagerBase, RendererBase
)
from matplotlib.backends.backend_mixed import MixedModeRenderer
from matplotlib.backends.backend_pdf import (
Expand Down
3 changes: 1 addition & 2 deletions lib/matplotlib/backends/backend_qt.py
Original file line number Diff line number Diff line change
Expand Up @@ -405,8 +405,7 @@ def start_event_loop(self, timeout=0):
raise RuntimeError("Event loop already running")
self._event_loop = event_loop = QtCore.QEventLoop()
if timeout > 0:
timer = QtCore.QTimer.singleShot(int(timeout * 1000),
event_loop.quit)
_ = QtCore.QTimer.singleShot(int(timeout * 1000), event_loop.quit)

with _maybe_allow_interrupt(event_loop):
qt_compat._exec(event_loop)
Expand Down
5 changes: 3 additions & 2 deletions lib/matplotlib/backends/backend_qt5agg.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
Render to qt from agg
"""

from .backend_qtagg import (
_BackendQTAgg, FigureCanvasQTAgg, FigureManagerQT, NavigationToolbar2QT,
from .backend_qtagg import _BackendQTAgg
from .backend_qtagg import ( # noqa: F401 # pylint: disable=W0611
FigureCanvasQTAgg, FigureManagerQT, NavigationToolbar2QT,
backend_version, FigureCanvasAgg, FigureCanvasQT
)

Expand Down
5 changes: 3 additions & 2 deletions lib/matplotlib/backends/backend_qt5cairo.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from .backend_qtcairo import (
_BackendQTCairo, FigureCanvasQTCairo, FigureCanvasCairo, FigureCanvasQT)
from .backend_qtcairo import _BackendQTCairo
from .backend_qtcairo import ( # noqa: F401 # pylint: disable=W0611
FigureCanvasQTCairo, FigureCanvasCairo, FigureCanvasQT)


@_BackendQTCairo.export
Expand Down
6 changes: 3 additions & 3 deletions lib/matplotlib/backends/backend_qtagg.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
from .qt_compat import QT_API, _enum, _setDevicePixelRatio
from .. import cbook
from .backend_agg import FigureCanvasAgg
from .backend_qt import (
QtCore, QtGui, QtWidgets, _BackendQT, FigureCanvasQT, FigureManagerQT,
NavigationToolbar2QT, backend_version)
from .backend_qt import QtCore, QtGui, _BackendQT, FigureCanvasQT
from .backend_qt import ( # noqa: F401 # pylint: disable=W0611
FigureManagerQT, NavigationToolbar2QT, backend_version)


class FigureCanvasQTAgg(FigureCanvasAgg, FigureCanvasQT):
Expand Down
5 changes: 3 additions & 2 deletions lib/matplotlib/backends/backend_tkagg.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
from . import _backend_tk
from .backend_agg import FigureCanvasAgg
from ._backend_tk import (
_BackendTk, FigureCanvasTk, FigureManagerTk, NavigationToolbar2Tk)
from ._backend_tk import _BackendTk, FigureCanvasTk
from ._backend_tk import ( # noqa: F401 # pylint: disable=W0611
FigureManagerTk, NavigationToolbar2Tk)


class FigureCanvasTkAgg(FigureCanvasAgg, FigureCanvasTk):
Expand Down
3 changes: 2 additions & 1 deletion lib/matplotlib/backends/backend_webagg.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@
from matplotlib.backend_bases import _Backend
from matplotlib._pylab_helpers import Gcf
from . import backend_webagg_core as core
from .backend_webagg_core import TimerAsyncio, TimerTornado
from .backend_webagg_core import ( # noqa: F401 # pylint: disable=W0611
TimerAsyncio, TimerTornado)


class ServerThread(threading.Thread):
Expand Down
3 changes: 0 additions & 3 deletions lib/matplotlib/backends/backend_wx.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,8 @@

from matplotlib import _api, cbook, backend_tools
from matplotlib._pylab_helpers import Gcf
from matplotlib.backend_managers import ToolManager
from matplotlib.figure import Figure
from matplotlib.path import Path
from matplotlib.transforms import Affine2D
from matplotlib.widgets import SubplotTool

import wx

Expand Down
4 changes: 2 additions & 2 deletions lib/matplotlib/backends/backend_wxagg.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

from .. import _api
from .backend_agg import FigureCanvasAgg
from .backend_wx import (
_BackendWx, _FigureCanvasWxBase, FigureFrameWx,
from .backend_wx import _BackendWx, _FigureCanvasWxBase, FigureFrameWx
from .backend_wx import ( # noqa: F401 # pylint: disable=W0611
NavigationToolbar2Wx as NavigationToolbar2WxAgg)


Expand Down
4 changes: 2 additions & 2 deletions lib/matplotlib/backends/backend_wxcairo.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

from .. import _api
from .backend_cairo import cairo, FigureCanvasCairo
from .backend_wx import (
_BackendWx, _FigureCanvasWxBase, FigureFrameWx,
from .backend_wx import _BackendWx, _FigureCanvasWxBase, FigureFrameWx
from .backend_wx import ( # noqa: F401 # pylint: disable=W0611
NavigationToolbar2Wx as NavigationToolbar2WxCairo)


Expand Down
2 changes: 1 addition & 1 deletion lib/matplotlib/backends/qt_compat.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
else:
try:
QT_API = _ETS[QT_API_ENV]
except KeyError as err:
except KeyError:
raise RuntimeError(
"The environment variable QT_API has the unrecognized value "
f"{QT_API_ENV!r}; "
Expand Down
0