[Python-checkins] cpython (3.5): Issue #25860: Fixed test failure caused by inconsistency of os.walk() and

[serhiy.storchaka]

https://hg.python.org/cpython/rev/7995a81236b6
changeset:   99664:7995a81236b6
branch:      3.5
parent:      99662:767262c149ca
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Wed Dec 23 00:37:34 2015 +0200
summary:
  Issue #25860: Fixed test failure caused by inconsistency of os.walk() and
os.fwalk() parameter names.

files:
  Lib/test/test_os.py |  2 ++
  1 files changed, 2 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -792,6 +792,8 @@
     # Wrapper to hide minor differences between os.walk and os.fwalk
     # to tests both functions with the same code base
     def walk(self, directory, **kwargs):
+        if 'follow_symlinks' in kwargs:
+            kwargs['followlinks'] = kwargs.pop('follow_symlinks')
         return os.walk(directory, **kwargs)
 
     def setUp(self):

-- 
Repository URL: https://hg.python.org/cpython