more srittau feedback

Author: JelleZijlstra

stdlib/genericpath.pyi

@@ -25,7 +25,6 @@ if sys.version_info >= (3, 13):
     __all__ += ["isjunction", "isdevdrive", "lexists"]
 if sys.version_info >= (3, 15):
     __all__ += ["ALL_BUT_LAST"]
-    ALL_BUT_LAST: object
 
 # All overloads can return empty string. Ideally, Literal[""] would be a valid
 # Iterable[T], so that list[T] | Literal[""] could be used as a return
@@ -94,3 +93,7 @@ if sys.version_info >= (3, 13):
 # Added in Python 3.9.23, 3.10.18, 3.11.13, 3.12.11, 3.13.4
 _AllowMissingType = NewType("_AllowMissingType", object)
 ALLOW_MISSING: _AllowMissingType
+
+if sys.version_info >= (3, 15):
+    _AllButLastType = NewType("_AllButLastType", object)
+    ALL_BUT_LAST: _AllButLastType

stdlib/http/server.pyi

@@ -10,27 +10,11 @@ from ssl import Purpose, SSLContext
 from typing import Any, AnyStr, BinaryIO, ClassVar, Protocol, type_check_only
 from typing_extensions import Self, deprecated
 
-if sys.version_info >= (3, 15):
-    __all__ = [
-        "HTTPServer",
-        "ThreadingHTTPServer",
-        "HTTPSServer",
-        "ThreadingHTTPSServer",
-        "BaseHTTPRequestHandler",
-        "SimpleHTTPRequestHandler",
-    ]
-elif sys.version_info >= (3, 14):
-    __all__ = [
-        "HTTPServer",
-        "ThreadingHTTPServer",
-        "HTTPSServer",
-        "ThreadingHTTPSServer",
-        "BaseHTTPRequestHandler",
-        "SimpleHTTPRequestHandler",
-        "CGIHTTPRequestHandler",
-    ]
-else:
-    __all__ = ["HTTPServer", "ThreadingHTTPServer", "BaseHTTPRequestHandler", "SimpleHTTPRequestHandler", "CGIHTTPRequestHandler"]
+__all__ = ["HTTPServer", "ThreadingHTTPServer", "BaseHTTPRequestHandler", "SimpleHTTPRequestHandler"]
+if sys.version_info < (3, 15):
+    __all__ += ["CGIHTTPRequestHandler"]
+if sys.version_info >= (3, 14):
+    __all__ = ["HTTPSServer", "ThreadingHTTPSServer"]
 
 class HTTPServer(socketserver.TCPServer):
     server_name: str

stdlib/ntpath.pyi

@@ -114,24 +114,19 @@ def join(path: StrPath, /, *paths: StrPath) -> str: ...
 @overload
 def join(path: BytesPath, /, *paths: BytesPath) -> bytes: ...
 
-if sys.platform == "win32":
-    if sys.version_info >= (3, 15):
-        @overload
-        def realpath(path: PathLike[AnyStr], /, *, strict: bool | _AllowMissingType = False) -> AnyStr: ...
-        @overload
-        def realpath(path: AnyStr, /, *, strict: bool | _AllowMissingType = False) -> AnyStr: ...
-    else:
+if sys.version_info >= (3, 15):
+    @overload
+    def realpath(path: PathLike[AnyStr], /, *, strict: bool | _AllowMissingType = False) -> AnyStr: ...
+    @overload
+    def realpath(path: AnyStr, /, *, strict: bool | _AllowMissingType = False) -> AnyStr: ...
+
+else:
+    if sys.platform == "win32":
         @overload
         def realpath(path: PathLike[AnyStr], *, strict: bool | _AllowMissingType = False) -> AnyStr: ...
         @overload
         def realpath(path: AnyStr, *, strict: bool | _AllowMissingType = False) -> AnyStr: ...
 
-else:
-    if sys.version_info >= (3, 15):
-        @overload
-        def realpath(path: PathLike[AnyStr], /, *, strict: bool | _AllowMissingType = False) -> AnyStr: ...
-        @overload
-        def realpath(path: AnyStr, /, *, strict: bool | _AllowMissingType = False) -> AnyStr: ...
     else:
         realpath = abspath