Following Nick's suggestion, rename posix.fdlistdir() to posix.flistdir(), to

be consistent with other functions accepting file descriptors (fdlistdir() was
added in 3.3, so hasn't been released yet).

3 files changed, 7 insertions, 7 deletions

diff --git a/Lib/os.py b/Lib/os.py
index ad5d538..301870c 100644
--- a/Lib/os.py
+++ b/Lib/os.py
@@ -357,7 +357,7 @@ if _exists("openat"):
         # whether to follow symlinks
         flag = 0 if followlinks else AT_SYMLINK_NOFOLLOW
 
-        names = fdlistdir(topfd)
+        names = flistdir(topfd)
         dirs, nondirs = [], []
         for name in names:
             # Here, we don't use AT_SYMLINK_NOFOLLOW to be consistent with
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index 7f955d1..8b07c77 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -611,8 +611,8 @@ class FwalkTests(WalkTests):
             for root, dirs, files, rootfd in os.fwalk(*args):
                 # check that the FD is valid
                 os.fstat(rootfd)
-                # check that fdlistdir() returns consistent information
-                self.assertEqual(set(os.fdlistdir(rootfd)), set(dirs) | set(files))
+                # check that flistdir() returns consistent information
+                self.assertEqual(set(os.flistdir(rootfd)), set(dirs) | set(files))
 
     def test_fd_leak(self):
         # Since we're opening a lot of FDs, we must be careful to avoid leaks:
diff --git a/Lib/test/test_posix.py b/Lib/test/test_posix.py
index f8c6baa..c3dfffb 100644
--- a/Lib/test/test_posix.py
+++ b/Lib/test/test_posix.py
@@ -451,18 +451,18 @@ class PosixTester(unittest.TestCase):
         if hasattr(posix, 'listdir'):
             self.assertTrue(support.TESTFN in posix.listdir())
 
-    @unittest.skipUnless(hasattr(posix, 'fdlistdir'), "test needs posix.fdlistdir()")
-    def test_fdlistdir(self):
+    @unittest.skipUnless(hasattr(posix, 'flistdir'), "test needs posix.flistdir()")
+    def test_flistdir(self):
         f = posix.open(posix.getcwd(), posix.O_RDONLY)
         self.addCleanup(posix.close, f)
         self.assertEqual(
             sorted(posix.listdir('.')),
-            sorted(posix.fdlistdir(f))
+            sorted(posix.flistdir(f))
             )
         # Check that the fd offset was reset (issue #13739)
         self.assertEqual(
             sorted(posix.listdir('.')),
-            sorted(posix.fdlistdir(f))
+            sorted(posix.flistdir(f))
             )
 
     def test_access(self):