apply suggestions from code review

yongrenjie · QuLogic · web-flow · commit 829f92e427e2 · 2021-07-06T22:57:35.000+01:00
Co-authored with @QuLogic Co-authored-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
diff --git a/lib/matplotlib/sphinxext/plot_directive.py b/lib/matplotlib/sphinxext/plot_directive.py
@@ -436,16 +436,19 @@ def out_of_date(original, derived, includes=None):
     *derived* and *original* are full paths, and *includes* is optionally a
     list of full paths which may have been included in the *original*.
     """
+    if not os.path.exists(derived):
+        return True
+
     if includes is None:
         includes = []
     files_to_check = [original, *includes]
 
-    def out_of_date_one(original, derived):
-        return (not os.path.exists(derived) or
-                (os.path.exists(original) and
-                 os.stat(derived).st_mtime < os.stat(original).st_mtime))
+    def out_of_date_one(original, derived_mtime):
+        return (os.path.exists(original) and
+                derived_mtime < os.stat(original).st_mtime)
 
-    return any(out_of_date_one(f, derived) for f in files_to_check)
+    derived_mtime = os.stat(derived).st_mtime
+    return any(out_of_date_one(f, derived_mtime) for f in files_to_check)
 
 
 class PlotError(RuntimeError):
@@ -763,9 +766,9 @@ def run(arguments, content, options, state_machine, state, lineno):
     except AttributeError:
         # the document.include_log attribute only exists in docutils >=0.17,
         # before that we need to inspect the state machine
-        possible_sources = [os.path.join(setup.confdir, t[0])
-                            for t in state_machine.input_lines.items]
-        source_file_includes = [f for f in set(possible_sources)
+        possible_sources = {os.path.join(setup.confdir, t[0])
+                            for t in state_machine.input_lines.items}
+        source_file_includes = [f for f in possible_sources
                                 if os.path.isfile(f)]
     # remove the source file itself from the includes
     try:
diff --git a/lib/matplotlib/tests/test_sphinxext.py b/lib/matplotlib/tests/test_sphinxext.py
@@ -3,9 +3,9 @@
 import filecmp
 import os
 from pathlib import Path
+import shutil
 from subprocess import Popen, PIPE
 import sys
-import shutil
 
 import pytest
 
@@ -15,7 +15,7 @@
 
 def test_tinypages(tmpdir):
     source_dir = Path(tmpdir) / 'src'
-    shutil.copytree(str(Path(__file__).parent / 'tinypages'), str(source_dir))
+    shutil.copytree(Path(__file__).parent / 'tinypages', source_dir)
     html_dir = source_dir / '_build' / 'html'
     doctree_dir = source_dir / 'doctrees'
 
@@ -63,11 +63,9 @@ def plot_directive_file(num):
     assert filecmp.cmp(range_6, plot_file(17))
 
     # Modify the included plot
-    with open(str(source_dir / 'included_plot_21.rst'), 'r') as file:
-        contents = file.read()
+    contents = (source_dir / 'included_plot_21.rst').read_text()
     contents = contents.replace('plt.plot(range(6))', 'plt.plot(range(4))')
-    with open(str(source_dir / 'included_plot_21.rst'), 'w') as file:
-        file.write(contents)
+    (source_dir / 'included_plot_21.rst').write_text(contents)
     # Build the pages again and check that the modified file was updated
     modification_times = [plot_directive_file(i).stat().st_mtime
                           for i in (1, 2, 3, 5)]
