Skip to content

bpo-31639: Change ThreadedHTTPServer to ThreadingHTTPServer class name #7195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JulienPalard merged 3 commits into from
May 29, 2018
Merged

bpo-31639: Change ThreadedHTTPServer to ThreadingHTTPServer class name #7195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
519a756
Change ThreadedHTTPServer to ThreadingHTTPServer class name
geryogam May 29, 2018
1bc3603
Change ThreadedHTTPServer to ThreadingHTTPServer class name
geryogam May 29, 2018
d8fc964
Change ThreadedHTTPServer to ThreadingHTTPServer class name
geryogam May 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Doc/library/http.server.rst
View file
Open in desktop
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
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion Misc/NEWS.d/next/Library/2017-12-27-21-55-19.bpo-31639.l3avDJ.rst
View file
Open in desktop
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.