Skip to content

Commit

Permalink
bpo-31639: Change ThreadedHTTPServer to ThreadingHTTPServer class name (
Browse files Browse the repository at this point in the history
  • Loading branch information
geryogam authored and JulienPalard committed May 29, 2018
1 parent 5d97b7b commit 1cee216
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions Doc/library/http.server.rst
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ handler. Code to create and run the server looks like this::
:attr:`server_port`. The server is accessible by the handler, typically
through the handler's :attr:`server` instance variable.

.. class:: ThreadedHTTPServer(server_address, RequestHandlerClass)
.. class:: ThreadingHTTPServer(server_address, RequestHandlerClass)

This class is identical to HTTPServer but uses threads to handle
requests by using the :class:`~socketserver.ThreadingMixIn`. This
Expand All @@ -43,7 +43,7 @@ handler. Code to create and run the server looks like this::
.. versionadded:: 3.7


The :class:`HTTPServer` and :class:`ThreadedHTTPServer` must be given
The :class:`HTTPServer` and :class:`ThreadingHTTPServer` must be given
a *RequestHandlerClass* on instantiation, of which this module
provides three different variants:

Expand Down
6 changes: 3 additions & 3 deletions Lib/http/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
__version__ = "0.6"

__all__ = [
"HTTPServer", "ThreadedHTTPServer", "BaseHTTPRequestHandler",
"HTTPServer", "ThreadingHTTPServer", "BaseHTTPRequestHandler",
"SimpleHTTPRequestHandler", "CGIHTTPRequestHandler",
]

Expand Down Expand Up @@ -140,7 +140,7 @@ def server_bind(self):
self.server_port = port


class ThreadedHTTPServer(socketserver.ThreadingMixIn, HTTPServer):
class ThreadingHTTPServer(socketserver.ThreadingMixIn, HTTPServer):
daemon_threads = True


Expand Down Expand Up @@ -1217,7 +1217,7 @@ def run_cgi(self):


def test(HandlerClass=BaseHTTPRequestHandler,
ServerClass=ThreadedHTTPServer,
ServerClass=ThreadingHTTPServer,
protocol="HTTP/1.0", port=8000, bind=""):
"""Test the HTTP request handler class.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
http.server now exposes a ThreadedHTTPServer class and uses it when the
http.server now exposes a ThreadingHTTPServer class and uses it when the
module is run with ``-m`` to cope with web browsers pre-opening sockets.

0 comments on commit 1cee216

Please sign in to comment.