From: Charles-François Natali <neologix@free.fr>
Date: Wed, 22 Feb 2012 20:03:09 +0000 (+0100)
Subject: Issue #14077: importlib: Fix regression introduced by de6703671386.
X-Git-Tag: v3.3.0a1~87
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6db1c40b374ecdf7324fa123db4c2202d4f986c9;p=python

Issue #14077: importlib: Fix regression introduced by de6703671386.
---

diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py
index f70869eac0..d10ab2f1f4 100644
--- a/Lib/importlib/_bootstrap.py
+++ b/Lib/importlib/_bootstrap.py
@@ -128,7 +128,9 @@ def _path_absolute(path):
 
 
 def _write_atomic(path, data):
-    """Function to write data to a path atomically."""
+    """Best-effort function to write data to a path atomically.
+    Be prepared to handle a FileExistsError if concurrent writing of the
+    temporary file is attempted."""
     # id() is used to generate a pseudo-random filename.
     path_tmp = '{}.{}'.format(path, id(path))
     fd = _os.open(path_tmp, _os.O_EXCL | _os.O_CREAT | _os.O_WRONLY, 0o666)
@@ -595,8 +597,9 @@ class _SourceFileLoader(_FileLoader, SourceLoader):
                 return
         try:
             _write_atomic(path, data)
-        except PermissionError:
-            # Don't worry if you can't write bytecode.
+        except (PermissionError, FileExistsError):
+            # Don't worry if you can't write bytecode or someone is writing
+            # it at the same time.
             pass