commit 4f53e2ac16e0bebae0a0c18f220295035b081ee3
author Julien Palard <julien@palard.fr> Wed May 30 02:24:17 2018 +0200
committer GitHub <noreply@github.com> Wed May 30 02:24:17 2018 +0200
tree 6ef6e5b27e46736cd7e38f40ea3933406f720096
parent d8948c5e09c4a2a818f6f6cfaf8064f2c2138fa5

[3.7] bpo-31639: Change ThreadedHTTPServer to ThreadingHTTPServer class name (GH-7195) (GH-7219)

* [3.7] bpo-31639: Change ThreadedHTTPServer to ThreadingHTTPServer class name (GH-7195).
(cherry picked from commit 1cee216cf383eade641aed22f4ec7d4cb565ecff)

* Fix whatsnew entry about ThreadedHTTPServer. (GH-7220)
(cherry picked from commit a34e424bdbc62b4d83593af1c0d459d8aaac90f3)

Lib/http/server.py

diff --git a/Lib/http/server.py b/Lib/http/server.py
index a2726ab..ea0e295 100644
--- a/Lib/http/server.py
+++ b/Lib/http/server.py
@@ -83,7 +83,7 @@
 __version__ = "0.6"
 
 __all__ = [
-    "HTTPServer", "ThreadedHTTPServer", "BaseHTTPRequestHandler",
+    "HTTPServer", "ThreadingHTTPServer", "BaseHTTPRequestHandler",
     "SimpleHTTPRequestHandler", "CGIHTTPRequestHandler",
 ]
 
@@ -140,7 +140,7 @@
         self.server_port = port
 
 
-class ThreadedHTTPServer(socketserver.ThreadingMixIn, HTTPServer):
+class ThreadingHTTPServer(socketserver.ThreadingMixIn, HTTPServer):
     daemon_threads = True
 
 
@@ -1217,7 +1217,7 @@
 
 
 def test(HandlerClass=BaseHTTPRequestHandler,
-         ServerClass=ThreadedHTTPServer,
+         ServerClass=ThreadingHTTPServer,
          protocol="HTTP/1.0", port=8000, bind=""):
     """Test the HTTP request handler class.