Merge pull request #15775 from anntzer/pathlib

QuLogic · web-flow · commit cafbc102bf80 · 2019-11-26T19:32:38.000-05:00
Some pathlibification.
diff --git a/examples/misc/image_thumbnail_sgskip.py b/examples/misc/image_thumbnail_sgskip.py
@@ -3,34 +3,30 @@
 Image Thumbnail
 ===============
 
-You can use matplotlib to generate thumbnails from existing images.
+You can use Matplotlib to generate thumbnails from existing images.
 Matplotlib relies on Pillow_ for reading images, and thus supports all formats
 supported by Pillow.
 
 .. _Pillow: http://python-pillow.org/
 """
 
-# build thumbnails of all images in a directory
+from argparse import ArgumentParser
+from pathlib import Path
 import sys
-import os
-import glob
 import matplotlib.image as image
 
 
-if len(sys.argv) != 2:
-    print('Usage: python %s IMAGEDIR' % __file__)
-    raise SystemExit
-indir = sys.argv[1]
-if not os.path.isdir(indir):
-    print('Could not find input directory "%s"' % indir)
-    raise SystemExit
+parser = ArgumentParser(
+    description="Build thumbnails of all images in a directory.")
+parser.add_argument("imagedir", type=Path)
+args = parser.parse_args()
+if not args.imagedir.isdir():
+    sys.exit(f"Could not find input directory {args.imagedir}")
 
-outdir = 'thumbs'
-if not os.path.exists(outdir):
-    os.makedirs(outdir)
+outdir = Path("thumbs")
+outdir.mkdir(parents=True, exist_ok=True)
 
-for fname in glob.glob(os.path.join(indir, '*.png')):
-    basedir, basename = os.path.split(fname)
-    outfile = os.path.join(outdir, basename)
-    fig = image.thumbnail(fname, outfile, scale=0.15)
-    print('saved thumbnail of %s to %s' % (fname, outfile))
+for path in args.imagedir.glob("*.png"):
+    outpath = outdir / path.name
+    fig = image.thumbnail(path, outpath, scale=0.15)
+    print(f"saved thumbnail of {path} to {outpath}")
diff --git a/examples/tests/backend_driver_sgskip.py b/examples/tests/backend_driver_sgskip.py
@@ -458,6 +458,7 @@ def parse_options():
         result.dirs[result.dirs.index('pylab_examples')] = 'pylab'
     return result
 
+
 if __name__ == '__main__':
     times = {}
     failures = {}
diff --git a/examples/user_interfaces/mpl_with_glade3_sgskip.py b/examples/user_interfaces/mpl_with_glade3_sgskip.py
@@ -5,12 +5,11 @@
 
 """
 
-import os
+from pathlib import Path
 
 import gi
 gi.require_version('Gtk', '3.0')
 from gi.repository import Gtk
-
 from matplotlib.figure import Figure
 from matplotlib.backends.backend_gtk3agg import (
     FigureCanvasGTK3Agg as FigureCanvas)
@@ -24,9 +23,9 @@ def on_window1_destroy(self, widget):
 
 def main():
     builder = Gtk.Builder()
-    builder.add_objects_from_file(os.path.join(os.path.dirname(__file__),
-                                               "mpl_with_glade3.glade"),
-                                  ("window1", ""))
+    builder.add_objects_from_file(
+        str(Path(__file__).parent / "mpl_with_glade3.glade"),
+        ("window1", ""))
     builder.connect_signals(Window1Signals())
     window = builder.get_object("window1")
     sw = builder.get_object("scrolledwindow1")
diff --git a/lib/matplotlib/afm.py b/lib/matplotlib/afm.py
@@ -37,7 +37,6 @@
 import logging
 import re
 
-
 from ._mathtext_data import uni2type1
 
 
diff --git a/lib/matplotlib/dviread.py b/lib/matplotlib/dviread.py
@@ -22,6 +22,7 @@
 from functools import lru_cache, partial, wraps
 import logging
 import os
+from pathlib import Path
 import re
 import struct
 import textwrap
@@ -203,12 +204,9 @@ def __init__(self, filename, dpi):
 
     def _get_baseline(self, filename):
         if rcParams['text.latex.preview']:
-            base, ext = os.path.splitext(filename)
-            baseline_filename = base + ".baseline"
-            if os.path.exists(baseline_filename):
-                with open(baseline_filename, 'rb') as fd:
-                    l = fd.read().split()
-                height, depth, width = l
+            baseline = Path(filename).with_suffix(".baseline")
+            if baseline.exists():
+                height, depth, width = baseline.read_bytes().split()
                 return float(depth)
         return None
 
diff --git a/lib/matplotlib/image.py b/lib/matplotlib/image.py
@@ -1435,8 +1435,7 @@ def imread(fname, format=None):
             if len(parsed.scheme) > 1:
                 ext = 'png'
             else:
-                basename, ext = os.path.splitext(fname)
-                ext = ext.lower()[1:]
+                ext = Path(fname).suffix.lower()[1:]
         elif hasattr(fname, 'geturl'):  # Returned by urlopen().
             # We could try to parse the url's path and use the extension, but
             # returning png is consistent with the block above.  Note that this
@@ -1445,8 +1444,7 @@ def imread(fname, format=None):
             # value "<urllib response>").
             ext = 'png'
         elif hasattr(fname, 'name'):
-            basename, ext = os.path.splitext(fname.name)
-            ext = ext.lower()[1:]
+            ext = Path(fname.name).suffix.lower()[1:]
         else:
             ext = 'png'
     else:
diff --git a/lib/matplotlib/sphinxext/mathmpl.py b/lib/matplotlib/sphinxext/mathmpl.py
@@ -1,5 +1,5 @@
 import hashlib
-import os
+from pathlib import Path
 
 from docutils import nodes
 from docutils.parsers.rst import Directive, directives
@@ -60,7 +60,7 @@ def run(self):
 def latex2png(latex, filename, fontset='cm'):
     latex = "$%s$" % latex
     with mpl.rc_context({'mathtext.fontset': fontset}):
-        if os.path.exists(filename):
+        if Path(filename).exists():
             depth = mathtext_parser.get_depth(latex, dpi=100)
         else:
             try:
@@ -80,11 +80,9 @@ def latex2html(node, source):
     name = 'math-{}'.format(
         hashlib.md5((latex + fontset).encode()).hexdigest()[-10:])
 
-    destdir = os.path.join(setup.app.builder.outdir, '_images', 'mathmpl')
-    if not os.path.exists(destdir):
-        os.makedirs(destdir)
-    dest = os.path.join(destdir, '%s.png' % name)
-    path = '/'.join((setup.app.builder.imgpath, 'mathmpl'))
+    destdir = Path(setup.app.builder.outdir, '_images', 'mathmpl')
+    destdir.mkdir(parents=True, exist_ok=True)
+    dest = destdir / f'{name}.png'
 
     depth = latex2png(latex, dest, fontset)
 
@@ -97,7 +95,8 @@ def latex2html(node, source):
     else:
         style = ''
 
-    return '<img src="%s/%s.png" %s%s/>' % (path, name, cls, style)
+    return (f'<img src="{setup.app.builder.imgpath}/mathmpl/{name}.png"'
+            f' {cls}{style}/>')
 
 
 def setup(app):
diff --git a/lib/matplotlib/tests/test_font_manager.py b/lib/matplotlib/tests/test_font_manager.py
@@ -179,8 +179,7 @@ def test_user_fonts_win32():
     os.makedirs(user_fonts_dir)
 
     # Copy the test font to the user font directory
-    shutil.copyfile(os.path.join(os.path.dirname(__file__), font_test_file),
-                    os.path.join(user_fonts_dir, font_test_file))
+    shutil.copy(Path(__file__).parent / font_test_file, user_fonts_dir)
 
     # Now, the font should be available
     fonts = findSystemFonts()
diff --git a/lib/matplotlib/tests/test_png.py b/lib/matplotlib/tests/test_png.py
@@ -1,6 +1,5 @@
 from io import BytesIO
-import glob
-import os
+from pathlib import Path
 
 import pytest
 
@@ -11,11 +10,8 @@
 
 @image_comparison(['pngsuite.png'], tol=0.03)
 def test_pngsuite():
-    dirname = os.path.join(
-        os.path.dirname(__file__),
-        'baseline_images',
-        'pngsuite')
-    files = sorted(glob.iglob(os.path.join(dirname, 'basn*.png')))
+    files = sorted(
+        (Path(__file__).parent / "baseline_images/pngsuite").glob("basn*.png"))
 
     plt.figure(figsize=(len(files), 2))
 
diff --git a/lib/mpl_toolkits/tests/__init__.py b/lib/mpl_toolkits/tests/__init__.py
@@ -1,9 +1,8 @@
-import os
+from pathlib import Path
 
 
 # Check that the test directories exist
-if not os.path.exists(os.path.join(
-        os.path.dirname(__file__), 'baseline_images')):
+if not (Path(__file__).parent / "baseline_images").exists():
     raise IOError(
         'The baseline image directory does not exist. '
         'This is most likely because the test data is not installed. '
