From: Georg Brandl Date: Mon, 11 Dec 2006 07:56:33 +0000 (+0000) Subject: Move errno imports back to individual functions. X-Git-Tag: v2.6a1~2378 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f54a63b3b5ff6c0fd2d115206d3cc60591318bb5;p=python Move errno imports back to individual functions. --- diff --git a/Lib/os.py b/Lib/os.py index 7d44dc4e65..c8cc274ec8 100644 --- a/Lib/os.py +++ b/Lib/os.py @@ -25,8 +25,6 @@ and opendir), and leave all pathname manipulation to os.path import sys -from errno import ENOENT, ENOTDIR, EEXIST - _names = sys.builtin_module_names # Note: more names are added to __all__ later. @@ -158,6 +156,7 @@ def makedirs(name, mode=0777): recursive. """ + from errno import EEXIST head, tail = path.split(name) if not tail: head, tail = path.split(head) @@ -366,6 +365,8 @@ def execvpe(file, args, env): __all__.extend(["execl","execle","execlp","execlpe","execvp","execvpe"]) def _execvpe(file, args, env=None): + from errno import ENOENT, ENOTDIR + if env is not None: func = execve argrest = (args, env)