gh-151788: Apply review suggestions

mjbommar · claude · mjbommar · commit d47f9fbe26e4 · 2026-06-21T08:29:37.000-04:00
- Drop the local `name` variable in favor of entry.name.
- Reword the OSError comment per review.
- Move the "Append /" comment above the is_dir check.
- Reword the NEWS entry per review (fix call -&gt; calls).

Co-Authored-By: Claude Opus 4.8 (1M context) &lt;noreply@anthropic.com&gt;
diff --git a/Lib/http/server.py b/Lib/http/server.py
@@ -900,11 +900,9 @@ def list_directory(self, path):
         r.append(f'<body>\n<h1>{title}</h1>')
         r.append('<hr>\n<ul>')
         for entry in entries:
-            name = entry.name
-            displayname = linkname = name
-            # Append / for directories or @ for symbolic links. is_dir() and
-            # is_symlink() can raise OSError where os.path.isdir()/islink()
-            # return False, so fall back to False to keep the same behavior.
+            displayname = linkname = entry.name
+            # Ignore any OSError raised by the os.DirEntry methods
+            # to match the behavior of their os.path.* counterpart.
             try:
                 is_dir = entry.is_dir()
             except OSError:
@@ -913,11 +911,12 @@ def list_directory(self, path):
                 is_symlink = entry.is_symlink()
             except OSError:
                 is_symlink = False
+            # Append / for directories or @ for symbolic links
             if is_dir:
-                displayname = name + "/"
-                linkname = name + "/"
+                displayname = entry.name + "/"
+                linkname = entry.name + "/"
             if is_symlink:
-                displayname = name + "@"
+                displayname = entry.name + "@"
                 # Note: a link to a directory displays with @ and links with /
             r.append('<li><a href="%s">%s</a></li>'
                     % (urllib.parse.quote(linkname,
diff --git a/Misc/NEWS.d/next/Library/2026-06-20-09-00-26.gh-issue-151788.Gr8IxK.rst b/Misc/NEWS.d/next/Library/2026-06-20-09-00-26.gh-issue-151788.Gr8IxK.rst
@@ -1,4 +1,4 @@
-:class:`http.server.SimpleHTTPRequestHandler` now uses :func:`os.scandir`
-instead of :func:`os.listdir` to build directory listings, avoiding an
-:func:`os.stat` call per entry. This can improve directory listing performance
-where ``stat`` calls are slow.
+:class:`http.server.SimpleHTTPRequestHandler` now relies on :func:`os.scandir`
+instead of :func:`os.listdir` to build directory listings, thereby reducing
+the total number of :func:`os.stat` calls per entry. This typically improves
+directory listing performance on filesystems where such calls are slow.
