From: Serhiy Storchaka <storchaka@gmail.com>
Date: Tue, 22 Dec 2015 22:37:34 +0000 (+0200)
Subject: Issue #25860: Fixed test failure caused by inconsistency of os.walk() and
X-Git-Tag: v3.6.0a1~871^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a17ca19d340766153db63959c307f5fd73880c19;p=thirdparty%2FPython%2Fcpython.git

Issue #25860: Fixed test failure caused by inconsistency of os.walk() and
os.fwalk() parameter names.
---

diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index 6c95ec7e1484..ade75a51ed52 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -792,6 +792,8 @@ class WalkTests(unittest.TestCase):
     # 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):