From 3ac4860205360656ea279970ff157b5634cdf75e Mon Sep 17 00:00:00 2001
From: Oscar Gustafsson <oscar.gustafsson@gmail.com>
Date: Sat, 19 Feb 2022 11:21:43 +0100
Subject: [PATCH 1/2] Cleanup unused imports and variables

---
 lib/matplotlib/backends/backend_agg.py      | 6 ++----
 lib/matplotlib/backends/backend_gtk3.py     | 6 +++---
 lib/matplotlib/backends/backend_gtk4.py     | 4 ++--
 lib/matplotlib/backends/backend_macosx.py   | 4 ++--
 lib/matplotlib/backends/backend_mixed.py    | 2 +-
 lib/matplotlib/backends/backend_nbagg.py    | 8 ++++----
 lib/matplotlib/backends/backend_pgf.py      | 3 +--
 lib/matplotlib/backends/backend_qt.py       | 3 +--
 lib/matplotlib/backends/backend_qt5agg.py   | 5 +++--
 lib/matplotlib/backends/backend_qt5cairo.py | 5 +++--
 lib/matplotlib/backends/backend_qtagg.py    | 6 +++---
 lib/matplotlib/backends/backend_tkagg.py    | 5 +++--
 lib/matplotlib/backends/backend_webagg.py   | 3 ++-
 lib/matplotlib/backends/backend_wx.py       | 3 ---
 lib/matplotlib/backends/backend_wxagg.py    | 4 ++--
 lib/matplotlib/backends/backend_wxcairo.py  | 4 ++--
 lib/matplotlib/backends/qt_compat.py        | 2 +-
 17 files changed, 35 insertions(+), 38 deletions(-)

diff --git a/lib/matplotlib/backends/backend_agg.py b/lib/matplotlib/backends/backend_agg.py
index 38089d5e0db9..9517b2dc346c 100644
--- a/lib/matplotlib/backends/backend_agg.py
+++ b/lib/matplotlib/backends/backend_agg.py
@@ -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
@@ -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 "
@@ -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"
diff --git a/lib/matplotlib/backends/backend_gtk3.py b/lib/matplotlib/backends/backend_gtk3.py
index 7796726a6778..877fd800c821 100644
--- a/lib/matplotlib/backends/backend_gtk3.py
+++ b/lib/matplotlib/backends/backend_gtk3.py
@@ -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
@@ -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__)
@@ -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(
diff --git a/lib/matplotlib/backends/backend_gtk4.py b/lib/matplotlib/backends/backend_gtk4.py
index d5508022c109..63663834ec00 100644
--- a/lib/matplotlib/backends/backend_gtk4.py
+++ b/lib/matplotlib/backends/backend_gtk4.py
@@ -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
@@ -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):
diff --git a/lib/matplotlib/backends/backend_macosx.py b/lib/matplotlib/backends/backend_macosx.py
index 7f8185284fca..69643e35fe3f 100644
--- a/lib/matplotlib/backends/backend_macosx.py
+++ b/lib/matplotlib/backends/backend_macosx.py
@@ -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)
diff --git a/lib/matplotlib/backends/backend_mixed.py b/lib/matplotlib/backends/backend_mixed.py
index 593c2bb3c0d8..0e0797186d04 100644
--- a/lib/matplotlib/backends/backend_mixed.py
+++ b/lib/matplotlib/backends/backend_mixed.py
@@ -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
 
 
diff --git a/lib/matplotlib/backends/backend_nbagg.py b/lib/matplotlib/backends/backend_nbagg.py
index abd2206e27d2..ec1430e60d1b 100644
--- a/lib/matplotlib/backends/backend_nbagg.py
+++ b/lib/matplotlib/backends/backend_nbagg.py
@@ -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():
diff --git a/lib/matplotlib/backends/backend_pgf.py b/lib/matplotlib/backends/backend_pgf.py
index f6a7349f26c8..1e3246b3de8f 100644
--- a/lib/matplotlib/backends/backend_pgf.py
+++ b/lib/matplotlib/backends/backend_pgf.py
@@ -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 (
diff --git a/lib/matplotlib/backends/backend_qt.py b/lib/matplotlib/backends/backend_qt.py
index 364e4a509ad6..5234b424d974 100644
--- a/lib/matplotlib/backends/backend_qt.py
+++ b/lib/matplotlib/backends/backend_qt.py
@@ -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)
diff --git a/lib/matplotlib/backends/backend_qt5agg.py b/lib/matplotlib/backends/backend_qt5agg.py
index d176fbe82bfb..d4f618df8ea7 100644
--- a/lib/matplotlib/backends/backend_qt5agg.py
+++ b/lib/matplotlib/backends/backend_qt5agg.py
@@ -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
 )
 
diff --git a/lib/matplotlib/backends/backend_qt5cairo.py b/lib/matplotlib/backends/backend_qt5cairo.py
index 98c033d511a7..02cf9920ce61 100644
--- a/lib/matplotlib/backends/backend_qt5cairo.py
+++ b/lib/matplotlib/backends/backend_qt5cairo.py
@@ -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
diff --git a/lib/matplotlib/backends/backend_qtagg.py b/lib/matplotlib/backends/backend_qtagg.py
index 0ccf32fccd1e..98c88dadd710 100644
--- a/lib/matplotlib/backends/backend_qtagg.py
+++ b/lib/matplotlib/backends/backend_qtagg.py
@@ -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):
diff --git a/lib/matplotlib/backends/backend_tkagg.py b/lib/matplotlib/backends/backend_tkagg.py
index 31012d80eab8..c20ce2cadd9e 100644
--- a/lib/matplotlib/backends/backend_tkagg.py
+++ b/lib/matplotlib/backends/backend_tkagg.py
@@ -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):
diff --git a/lib/matplotlib/backends/backend_webagg.py b/lib/matplotlib/backends/backend_webagg.py
index 3f18fdc93df7..a78e86c25af8 100644
--- a/lib/matplotlib/backends/backend_webagg.py
+++ b/lib/matplotlib/backends/backend_webagg.py
@@ -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):
diff --git a/lib/matplotlib/backends/backend_wx.py b/lib/matplotlib/backends/backend_wx.py
index 7ebb9178f593..4e3feadcdf0e 100644
--- a/lib/matplotlib/backends/backend_wx.py
+++ b/lib/matplotlib/backends/backend_wx.py
@@ -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
 
diff --git a/lib/matplotlib/backends/backend_wxagg.py b/lib/matplotlib/backends/backend_wxagg.py
index 67cf58c4408d..ca7f91583766 100644
--- a/lib/matplotlib/backends/backend_wxagg.py
+++ b/lib/matplotlib/backends/backend_wxagg.py
@@ -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)
 
 
diff --git a/lib/matplotlib/backends/backend_wxcairo.py b/lib/matplotlib/backends/backend_wxcairo.py
index 21d2e5d0d60d..ce1b7755d125 100644
--- a/lib/matplotlib/backends/backend_wxcairo.py
+++ b/lib/matplotlib/backends/backend_wxcairo.py
@@ -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)
 
 
diff --git a/lib/matplotlib/backends/qt_compat.py b/lib/matplotlib/backends/qt_compat.py
index a8861f3db5f8..fd35b31dd7e1 100644
--- a/lib/matplotlib/backends/qt_compat.py
+++ b/lib/matplotlib/backends/qt_compat.py
@@ -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}; "

From 86776810ab64540f78d9caea59f5973bba82aa9c Mon Sep 17 00:00:00 2001
From: Oscar Gustafsson <oscar.gustafsson@gmail.com>
Date: Wed, 23 Feb 2022 12:44:20 +0100
Subject: [PATCH 2/2] Apply suggestions from code review

Co-authored-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
---
 lib/matplotlib/backends/backend_tkagg.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/matplotlib/backends/backend_tkagg.py b/lib/matplotlib/backends/backend_tkagg.py
index c20ce2cadd9e..f95b6011eadf 100644
--- a/lib/matplotlib/backends/backend_tkagg.py
+++ b/lib/matplotlib/backends/backend_tkagg.py
@@ -2,7 +2,7 @@
 from .backend_agg import FigureCanvasAgg
 from ._backend_tk import _BackendTk, FigureCanvasTk
 from ._backend_tk import (  # noqa: F401 # pylint: disable=W0611
-                          FigureManagerTk, NavigationToolbar2Tk)
+    FigureManagerTk, NavigationToolbar2Tk)
 
 
 class FigureCanvasTkAgg(FigureCanvasAgg, FigureCanvasTk):