summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Collins <rbtcollins@hp.com>2015-08-17 00:18:35 (GMT)
committerRobert Collins <rbtcollins@hp.com>2015-08-17 00:18:35 (GMT)
commit9644f2450dacd8c62ce7bd908d093cd5b0a7a8c7 (patch)
tree418e9bf85774c1d0a0e75bbb0a6340eb2a38c3d9
parentc6dd5b1c66fc1f3f795f4f2a45ef88a83c005b16 (diff)
downloadcpython-9644f2450dacd8c62ce7bd908d093cd5b0a7a8c7.zip
cpython-9644f2450dacd8c62ce7bd908d093cd5b0a7a8c7.tar.gz
cpython-9644f2450dacd8c62ce7bd908d093cd5b0a7a8c7.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 47655e7..ce0f6cf 100644
--- a/Lib/http/server.py
+++ b/Lib/http/server.py
@@ -1211,8 +1211,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 f5868f9..6e80a33 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -610,6 +610,7 @@ Alan Hourihane
Ken Howard
Brad Howes
Mike Hoy
+Chiu-Hsiang Hsu
Chih-Hao Huang
Christian Hudon
Lawrence Hudson
diff --git a/Misc/NEWS b/Misc/NEWS
index 9c4ea33..0388197 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -75,6 +75,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.