Minor simplifications.

anntzer · Stephen-Chilcote · commit ed4255b9d1dc · 2018-12-11T12:59:57.000-05:00
diff --git a/lib/matplotlib/tests/test_backend_nbagg.py b/lib/matplotlib/tests/test_backend_nbagg.py
@@ -13,13 +13,12 @@ def _notebook_run(nb_file):
     """Execute a notebook via nbconvert and collect output.
        :returns (parsed nb object, execution errors)
     """
-    with tempfile.NamedTemporaryFile(suffix=".ipynb",
-                                     mode='w+t') as fout:
-        args = ["jupyter", "nbconvert", "--to", "notebook", "--execute",
-          "--ExecutePreprocessor.timeout=500",
-          "--output", fout.name, nb_file]
-        subprocess.check_call(args)
-
+    with tempfile.NamedTemporaryFile(suffix=".ipynb", mode='w+t') as fout:
+        subprocess.check_call([
+            "jupyter", "nbconvert", "--to", "notebook",
+            "--execute", "--ExecutePreprocessor.timeout=500",
+            "--output", fout.name, nb_file,
+        ])
         fout.seek(0)
         nb = nbformat.read(fout, nbformat.current_nbformat)
 
@@ -30,6 +29,5 @@ def _notebook_run(nb_file):
 
 
 def test_ipynb():
-    nb, errors = _notebook_run(
-        str(Path(__file__).parent / 'test_nbagg_01.ipynb'))
+    nb, errors = _notebook_run(Path(__file__).parent / 'test_nbagg_01.ipynb')
     assert errors == []
diff --git a/lib/matplotlib/tests/test_font_manager.py b/lib/matplotlib/tests/test_font_manager.py
@@ -1,7 +1,6 @@
-import os
+from pathlib import Path
 import shutil
 import sys
-import tempfile
 import warnings
 
 import numpy as np
@@ -19,9 +18,8 @@ def test_font_priority():
     with rc_context(rc={
             'font.sans-serif':
             ['cmmi10', 'Bitstream Vera Sans']}):
-        font = findfont(
-            FontProperties(family=["sans-serif"]))
-    assert os.path.basename(font) == 'cmmi10.ttf'
+        font = findfont(FontProperties(family=["sans-serif"]))
+    assert Path(font).name == 'cmmi10.ttf'
 
     # Smoketest get_charmap, which isn't used internally anymore
     font = get_font(font)
@@ -41,18 +39,12 @@ def test_score_weight():
             fontManager.score_weight(400, 400))
 
 
-def test_json_serialization():
-    # on windows, we can't open a file twice, so save the name and unlink
-    # manually...
-    try:
-        name = None
-        with tempfile.NamedTemporaryFile(delete=False) as temp:
-            name = temp.name
-        json_dump(fontManager, name)
-        copy = json_load(name)
-    finally:
-        if name and os.path.exists(name):
-            os.remove(name)
+def test_json_serialization(tmpdir):
+    # Can't open a NamedTemporaryFile twice on Windows, so use a temporary
+    # directory instead.
+    path = Path(tmpdir, "fontlist.json")
+    json_dump(fontManager, path)
+    copy = json_load(path)
     with warnings.catch_warnings():
         warnings.filterwarnings('ignore', 'findfont: Font family.*not found')
         for prop in ({'family': 'STIXGeneral'},
@@ -65,9 +57,8 @@ def test_json_serialization():
 
 def test_otf():
     fname = '/usr/share/fonts/opentype/freefont/FreeMono.otf'
-    if os.path.exists(fname):
+    if Path(fname).exists():
         assert is_opentype_cff_font(fname)
-
     for f in fontManager.ttflist:
         if 'otf' in f.fname:
             with open(f.fname, 'rb') as fd:
