mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #25583: Merge makedirs fix from 3.4 into 3.5

Browse source
This commit is contained in:
Martin Panter 2015-11-20 02:35:46 +00:00
commit 97cabb9fa5
3 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/os.py
View file

@ -230,7 +230,7 @@ def makedirs(name, mode=0o777, exist_ok=False):
try:
makedirs(head, mode, exist_ok)
except FileExistsError:
# be happy if someone already created the path
# Defeats race condition when another thread created the path
pass
cdir = curdir
if isinstance(tail, bytes):
@ -239,8 +239,10 @@ def makedirs(name, mode=0o777, exist_ok=False):
return
try:
mkdir(name, mode)
except OSError as e:
if not exist_ok or e.errno != errno.EEXIST or not path.isdir(name):
except OSError:
# Cannot rely on checking for EEXIST, since the operating system
# could give priority to other errors like EACCES or EROFS
if not exist_ok or not path.isdir(name):
raise
def removedirs(name):