summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Collins <rbtcollins@hp.com>2015-08-17 00:19:35 (GMT)
committerRobert Collins <rbtcollins@hp.com>2015-08-17 00:19:35 (GMT)
commit61e767b8fb6c85231e7d68043c95b06922bab142 (patch)
treeb8704ad24e6fe24c9010d0b390202bec384bacf6
parentbb562a9a5659d7c97790454e1b76819614dead26 (diff)
parent5409177b6235fab3fd1c50955b2b8f032cc8e8af (diff)
downloadcpython-61e767b8fb6c85231e7d68043c95b06922bab142.zip
cpython-61e767b8fb6c85231e7d68043c95b06922bab142.tar.gz
cpython-61e767b8fb6c85231e7d68043c95b06922bab142.tar.bz2
Issue #24774: Fix docstring in http.server.test.
Patch from Chiu-Hsiang Hsu.
-rw-r--r--Lib/http/server.py3
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS2
3 files changed, 4 insertions, 2 deletions
diff --git a/Lib/http/server.py b/Lib/http/server.py
index fd13be3..6a0e6fe 100644
--- a/Lib/http/server.py
+++ b/Lib/http/server.py
@@ -1167,8 +1167,7 @@ def test(HandlerClass=BaseHTTPRequestHandler,
ServerClass=HTTPServer, protocol="HTTP/1.0", port=8000, bind=""):
"""Test the HTTP request handler class.
- This runs an HTTP server on port 8000 (or the first command line
- argument).
+ This runs an HTTP server on port 8000 (or the port argument).
"""
server_address = (bind, port)
diff --git a/Misc/ACKS b/Misc/ACKS
index 856080f..22e8d73 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -622,6 +622,7 @@ Ken Howard
Brad Howes
Mike Hoy
Ben Hoyt
+Chiu-Hsiang Hsu
Chih-Hao Huang
Christian Hudon
Lawrence Hudson
diff --git a/Misc/NEWS b/Misc/NEWS
index a3a749d..4cdc02f 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -22,6 +22,8 @@ Core and Builtins
Library
-------
+- Issue #24774: Fix docstring in http.server.test. Patch from Chiu-Hsiang Hsu.
+
- Issue #21159: Improve message in configparser.InterpolationMissingOptionError.
Patch from Ɓukasz Langa.