matplotlib
diff --git a/‎lib/matplotlib/tests/test_sphinxext.py
Copy file name to clipboard
+12-11Lines changed: 12 additions & 11 deletions b/‎lib/matplotlib/tests/test_sphinxext.py
Copy file name to clipboard
+12-11Lines changed: 12 additions & 11 deletions
@@ -1,7 +1,7 @@
 """Tests for tinypages build using sphinx extensions."""
 
 import filecmp
-from os.path import join as pjoin, dirname, isdir
+from pathlib import Path
 from subprocess import Popen, PIPE
 import sys
 
@@ -12,11 +12,13 @@
 
 
 def test_tinypages(tmpdir):
-    html_dir = pjoin(str(tmpdir), 'html')
-    doctree_dir = pjoin(str(tmpdir), 'doctrees')
+    tmp_path = Path(tmpdir)
+    html_dir = tmp_path / 'html'
+    doctree_dir = tmp_path / 'doctrees'
     # Build the pages with warnings turned into errors
-    cmd = [sys.executable, '-msphinx', '-W', '-b', 'html', '-d', doctree_dir,
-           pjoin(dirname(__file__), 'tinypages'), html_dir]
+    cmd = [sys.executable, '-msphinx', '-W', '-b', 'html',
+           '-d', str(doctree_dir),
+           str(Path(__file__).parent / 'tinypages'), str(html_dir)]
     proc = Popen(cmd, stdout=PIPE, stderr=PIPE, universal_newlines=True)
     out, err = proc.communicate()
     assert proc.returncode == 0, \
@@ -25,10 +27,10 @@ def test_tinypages(tmpdir):
         pytest.fail("sphinx build emitted the following warnings:\n{}"
                     .format(err))
 
-    assert isdir(html_dir)
+    assert html_dir.is_dir()
 
     def plot_file(num):
-        return pjoin(html_dir, 'some_plots-{0}.png'.format(num))
+        return html_dir / f'some_plots-{num}.png'
 
     range_10, range_6, range_4 = [plot_file(i) for i in range(1, 4)]
     # Plot 5 is range(6) plot
@@ -43,11 +45,10 @@ def plot_file(num):
     # Plot 13 shows close-figs in action
     assert filecmp.cmp(range_4, plot_file(13))
     # Plot 14 has included source
-    with open(pjoin(html_dir, 'some_plots.html'), 'rb') as fobj:
-        html_contents = fobj.read()
+    html_contents = (html_dir / 'some_plots.html').read_bytes()
     assert b'# Only a comment' in html_contents
     # check plot defined in external file.
-    assert filecmp.cmp(range_4, pjoin(html_dir, 'range4.png'))
-    assert filecmp.cmp(range_6, pjoin(html_dir, 'range6.png'))
+    assert filecmp.cmp(range_4, html_dir / 'range4.png')
+    assert filecmp.cmp(range_6, html_dir / 'range6.png')
     # check if figure caption made it into html file
     assert b'This is the caption for plot 15.' in html_contents