Make flake8 happy

chahak13 · chahak13 · commit faed9bacfd4c · 2023-10-23T21:30:28.000-04:00
diff --git a/lib/matplotlib/__init__.pyi b/lib/matplotlib/__init__.pyi
@@ -32,12 +32,12 @@ __all__ = [
 import os
 from pathlib import Path
 
-from collections.abc import Callable, Generator
+from collections.abc import Callable, Generator, MutableMapping
 import contextlib
 from packaging.version import Version
 
 from matplotlib._api import MatplotlibDeprecationWarning
-from typing import Any, NamedTuple
+from typing import Any, NamedTuple, Self
 
 class _VersionInfo(NamedTuple):
     major: int
@@ -79,8 +79,8 @@ class RcParams(MutableMapping[str, Any]):
     def __delitem__(self, key: str) -> None: ...
     def __iter__(self) -> Generator[str, None, None]: ...
     def __len__(self) -> int: ...
-    def find_all(self, pattern: str) -> RcParams: ...
-    def copy(self) -> RcParams: ...
+    def find_all(self, pattern: str) -> Self: ...
+    def copy(self) -> Self: ...
 
 def rc_params(fail_on_error: bool = ...) -> RcParams: ...
 def rc_params_from_file(
diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py
@@ -67,6 +67,7 @@
 from matplotlib.gridspec import GridSpec, SubplotSpec
 from matplotlib import rcParams, get_backend, rcParamsOrig
 from matplotlib.rcsetup import interactive_bk as _interactive_bk
+from matplotlib.rcsetup import _auto_backend_sentinel
 from matplotlib.artist import Artist
 from matplotlib.axes import Axes, Subplot  # type: ignore
 from matplotlib.projections import PolarAxes  # type: ignore
@@ -302,7 +303,7 @@ def switch_backend(newbackend: str) -> None:
     # make sure the init is pulled up so we can assign to it later
     import matplotlib.backends
 
-    if newbackend is rcsetup._auto_backend_sentinel:
+    if newbackend is _auto_backend_sentinel:
         current_framework = cbook._get_running_interactive_framework()
         mapping = {'qt': 'qtagg',
                    'gtk3': 'gtk3agg',
@@ -2475,9 +2476,9 @@ def polar(*args, **kwargs) -> list[Line2D]:
 # is compatible with the current running interactive framework.
 if (rcParams["backend_fallback"]
         and rcParams._get_backend_or_none() in (  # type: ignore
-            set(rcsetup.interactive_bk) - {'WebAgg', 'nbAgg'})
+            set(_interactive_bk) - {'WebAgg', 'nbAgg'})
         and cbook._get_running_interactive_framework()):  # type: ignore
-    rcParams._set("backend", rcsetup._auto_backend_sentinel)  # type: ignore
+    rcParams._set("backend", _auto_backend_sentinel)  # type: ignore
 
 # fmt: on
 
diff --git a/lib/matplotlib/tests/test_offsetbox.py b/lib/matplotlib/tests/test_offsetbox.py
@@ -257,14 +257,9 @@ def test_anchoredtext_horizontal_alignment():
     ax.add_artist(text2)
 
 
-<<<<<<< HEAD
 @pytest.mark.parametrize("extent_kind", ["window_extent", "tightbbox"])
 def test_annotationbbox_extents(extent_kind):
     plt.rcParams.update(plt.rcParamsDefault)
-=======
-def test_annotationbbox_extents():
-    plt.rcParams.clear()
->>>>>>> 57d742c95e (Remove `rcParamsDefault`)
     fig, ax = plt.subplots(figsize=(4, 3), dpi=100)
 
     ax.axis([0, 1, 0, 1])
