STY: formatting and import sorting

tacaswell · tacaswell · commit 2852ff7c2588 · 2024-02-08T16:49:32.000-05:00
diff --git a/lib/matplotlib/tests/test_backend_nbagg.py b/lib/matplotlib/tests/test_backend_nbagg.py
@@ -1,6 +1,5 @@
 import os
 from pathlib import Path
-
 from tempfile import TemporaryDirectory
 
 import pytest
diff --git a/lib/matplotlib/tests/test_backend_webagg.py b/lib/matplotlib/tests/test_backend_webagg.py
@@ -1,8 +1,8 @@
 import os
 import sys
 import pytest
-import matplotlib.backends.backend_webagg_core
 
+import matplotlib.backends.backend_webagg_core
 from matplotlib.testing import subprocess_run_for_testing
 
 
@@ -24,9 +24,7 @@ def test_webagg_fallback(backend):
         + "print(plt.get_backend());"
         f"assert '{backend}' == plt.get_backend().lower();"
     )
-    subprocess_run_for_testing(
-        [sys.executable, "-c", test_code], env=env, check=True
-    )
+    subprocess_run_for_testing([sys.executable, "-c", test_code], env=env, check=True)
 
 
 def test_webagg_core_no_toolbar():
diff --git a/lib/matplotlib/tests/test_determinism.py b/lib/matplotlib/tests/test_determinism.py
@@ -3,7 +3,6 @@
 """
 
 import os
-import subprocess
 import sys
 
 import pytest
@@ -135,5 +134,5 @@ def test_determinism_source_date_epoch(fmt, string):
          f"from matplotlib.tests.test_determinism import _save_figure; "
          f"_save_figure('', {fmt!r})"],
         env={**os.environ, "SOURCE_DATE_EPOCH": "946684800",
-             "MPLBACKEND": "Agg"}, stdout=subprocess.PIPE, text=False).stdout
+             "MPLBACKEND": "Agg"}, capture_output=True, text=False).stdout
     assert string in buf
diff --git a/lib/matplotlib/tests/test_font_manager.py b/lib/matplotlib/tests/test_font_manager.py
@@ -277,13 +277,7 @@ def bad_idea(n):
 def test_fontcache_thread_safe():
     pytest.importorskip('threading')
 
-    proc = subprocess_run_helper(
-        _test_threading,
-        timeout=10
-    )
-    if proc.returncode:
-        pytest.fail("The subprocess returned with non-zero exit status "
-                    f"{proc.returncode}.")
+    subprocess_run_helper(_test_threading, timeout=10)
 
 
 def test_fontentry_dataclass():
diff --git a/lib/matplotlib/tests/test_matplotlib.py b/lib/matplotlib/tests/test_matplotlib.py
@@ -74,7 +74,7 @@ def test_importable_with__OO():
         "import matplotlib.cbook as cbook; "
         "import matplotlib.patches as mpatches"
     )
-    cmd = [sys.executable, "-OO", "-c", program]
     subprocess_run_for_testing(
-        cmd, env={**os.environ, "MPLBACKEND": ""}, check=True
+        [sys.executable, "-OO", "-c", program],
+        env={**os.environ, "MPLBACKEND": ""}, check=True
         )
diff --git a/lib/matplotlib/tests/test_texmanager.py b/lib/matplotlib/tests/test_texmanager.py
@@ -1,15 +1,14 @@
 import os
 from pathlib import Path
 import re
-
 import sys
 
-import matplotlib.pyplot as plt
-from matplotlib.texmanager import TexManager
-from matplotlib.testing._markers import needs_usetex
 import pytest
 
+import matplotlib.pyplot as plt
 from matplotlib.testing import subprocess_run_for_testing
+from matplotlib.testing._markers import needs_usetex
+from matplotlib.texmanager import TexManager
 
 
 def test_fontconfig_preamble():

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ def test_importable_with__OO():`
`74`	`74`	`"import matplotlib.cbook as cbook; "`
`75`	`75`	`"import matplotlib.patches as mpatches"`
`76`	`76`	`)`
`77`		`- cmd = [sys.executable, "-OO", "-c", program]`
`78`	`77`	`subprocess_run_for_testing(`
`79`		`- cmd, env={**os.environ, "MPLBACKEND": ""}, check=True`
	`78`	`+ [sys.executable, "-OO", "-c", program],`
	`79`	`+ env={**os.environ, "MPLBACKEND": ""}, check=True`
`80`	`80`	`)`