mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-22 17:55:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Backport of issue 1755179 fix.

Browse source
This commit is contained in:
Facundo Batista 2008-01-07 16:49:02 +00:00
parent 6e3e6e0d77
commit d0dcbc4ba2
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Lib/os.py
View file

@ -23,7 +23,7 @@ and opendir), and leave all pathname manipulation to os.path
#' #'
import sys import sys, errno
_names = sys.builtin_module_names _names = sys.builtin_module_names
@ -156,7 +156,6 @@ def makedirs(name, mode=0777):
recursive. recursive.
""" """
from errno import EEXIST
head, tail = path.split(name) head, tail = path.split(name)
if not tail: if not tail:
head, tail = path.split(head) head, tail = path.split(head)
@ -165,7 +164,7 @@ def makedirs(name, mode=0777):
makedirs(head, mode) makedirs(head, mode)
except OSError, e: except OSError, e:
# be happy if someone already created the path # be happy if someone already created the path
if e.errno != EEXIST: if e.errno != errno.EEXIST:
raise raise
if tail == curdir: # xxx/newdir/. exists if xxx/newdir exists if tail == curdir: # xxx/newdir/. exists if xxx/newdir exists
return return
@ -365,8 +364,6 @@ def execvpe(file, args, env):
__all__.extend(["execl","execle","execlp","execlpe","execvp","execvpe"]) __all__.extend(["execl","execle","execlp","execlpe","execvp","execvpe"])
def _execvpe(file, args, env=None): def _execvpe(file, args, env=None):
from errno import ENOENT, ENOTDIR
if env is not None: if env is not None:
func = execve func = execve
argrest = (args, env) argrest = (args, env)
@ -392,7 +389,7 @@ def _execvpe(file, args, env=None):
func(fullname, *argrest) func(fullname, *argrest)
except error, e: except error, e:
tb = sys.exc_info()[2] tb = sys.exc_info()[2]
if (e.errno != ENOENT and e.errno != ENOTDIR if (e.errno != errno.ENOENT and e.errno != errno.ENOTDIR
and saved_exc is None): and saved_exc is None):
saved_exc = e saved_exc = e
saved_tb = tb saved_tb = tb