changeset:   94950:1a972140ab62
user:        Victor Stinner <victor.stinner@gmail.com>
date:        Thu Mar 12 09:12:48 2015 +0100
files:       Lib/os.py
description:
Issue #23605: os.walk() doesn't need to call entry.is_symlink() if followlinks
is True


diff -r a3b889e9d3f3 -r 1a972140ab62 Lib/os.py
--- a/Lib/os.py	Wed Mar 11 18:22:29 2015 +0200
+++ b/Lib/os.py	Thu Mar 12 09:12:48 2015 +0100
@@ -374,7 +374,10 @@
 
             if is_dir:
                 dirs.append(entry.name)
+            else:
+                nondirs.append(entry.name)
 
+            if is_dir and not followlinks:
                 try:
                     if entry.is_symlink():
                         symlinks.add(entry.name)
@@ -383,8 +386,6 @@
                     # entry is not a symbolik link, same behaviour than
                     # os.path.islink().
                     pass
-            else:
-                nondirs.append(entry.name)
     except OSError as error:
         # scandir() or iterating into scandir() iterator raised an OSError
         if onerror is not None: