Merge pull request #3250 from cgohlke/patch-2

tacaswell · tacaswell · commit 4314d447dfc7 · 2014-07-17T23:04:55.000-04:00
Fix WindowsError: [Error 32] The process cannot access the file
diff --git a/lib/matplotlib/backends/backend_pdf.py b/lib/matplotlib/backends/backend_pdf.py
@@ -2,7 +2,7 @@
 
 """
 A PDF matplotlib backend
-Author: Jouni K Sepp�nen <jks@iki.fi>
+Author: Jouni K Sepp�nen <jks@iki.fi>
 """
 from __future__ import (absolute_import, division, print_function,
                         unicode_literals)
@@ -2382,7 +2382,8 @@ def close(self):
         PDF file.
         """
         self._file.close()
-        if self.get_pagecount() == 0 and self.keep_empty is False:
+        if (self.get_pagecount() == 0 and not self.keep_empty
+                and not self._file.passed_in_file_object):
             os.remove(self._file.fh.name)
         self._file = None
 
diff --git a/lib/matplotlib/tests/test_backend_pdf.py b/lib/matplotlib/tests/test_backend_pdf.py
@@ -64,12 +64,11 @@ def test_multipage_keep_empty():
         with PdfPages(tmp) as pdf:
             filename = pdf._file.fh.name
         assert os.path.exists(filename)
-        os.remove(filename)
+    os.remove(filename)
     # test if an empty pdf is deleting itself afterwards with keep_empty=False
-    with NamedTemporaryFile(delete=False) as tmp:
-        with PdfPages(tmp, keep_empty=False) as pdf:
-            filename = pdf._file.fh.name
-        assert not os.path.exists(filename)
+    with PdfPages(filename, keep_empty=False) as pdf:
+        pass
+    assert not os.path.exists(filename)
     ### test pdf files with content, they should never be deleted
     fig = plt.figure()
     ax = fig.add_subplot(111)
@@ -80,11 +79,11 @@ def test_multipage_keep_empty():
             filename = pdf._file.fh.name
             pdf.savefig()
         assert os.path.exists(filename)
-        os.remove(filename)
+    os.remove(filename)
     # test that a non-empty pdf is left behind with keep_empty=False
     with NamedTemporaryFile(delete=False) as tmp:
         with PdfPages(tmp, keep_empty=False) as pdf:
             filename = pdf._file.fh.name
             pdf.savefig()
         assert os.path.exists(filename)
-        os.remove(filename)
+    os.remove(filename)
