From: Georg Brandl <georg@python.org>
Date: Mon, 11 Dec 2006 07:56:43 +0000 (+0000)
Subject: Move errno imports back to individual functions.
X-Git-Tag: v2.5.1c1~219
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9e2423ae8f6970ce95c6522e2efb8dedbbb96622;p=thirdparty%2FPython%2Fcpython.git

Move errno imports back to individual functions.
 (backport from rev. 52996)
---

diff --git a/Lib/os.py b/Lib/os.py
index 7d44dc4e65ee..c8cc274ec829 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)