From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 20 Nov 2009 02:56:43 +0000 (+0000)
Subject: avoid doing an uneeded import in a function
X-Git-Tag: v2.7a1~67
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=246ec332fda2b8bbd6e6b4335cd540db5238698d;p=python

avoid doing an uneeded import in a function
---

diff --git a/Lib/os.py b/Lib/os.py
index c41af1ae3c..e8a011337c 100644
--- a/Lib/os.py
+++ b/Lib/os.py
@@ -263,7 +263,7 @@ def walk(top, topdown=True, onerror=None, followlinks=False):
             dirs.remove('CVS')  # don't visit CVS directories
     """
 
-    from os.path import join, isdir, islink
+    islink, join, isdir = path.islink, path.join, path.isdir
 
     # We may not have read permission for top, in which case we can't
     # get a list of the files the directory contains.  os.path.walk
@@ -289,9 +289,9 @@ def walk(top, topdown=True, onerror=None, followlinks=False):
     if topdown:
         yield top, dirs, nondirs
     for name in dirs:
-        path = join(top, name)
-        if followlinks or not islink(path):
-            for x in walk(path, topdown, onerror, followlinks):
+        new_path = join(top, name)
+        if followlinks or not islink(new_path):
+            for x in walk(new_path, topdown, onerror, followlinks):
                 yield x
     if not topdown:
         yield top, dirs, nondirs