changeset:   97403:845c79097c21
branch:      3.5
parent:      97391:70d422efa742
parent:      97402:d9e0c82d8653
user:        Robert Collins <rbtcollins@hp.com>
date:        Mon Aug 17 12:19:19 2015 +1200
files:       Lib/http/server.py Misc/ACKS Misc/NEWS
description:
Issue #24774: Fix docstring in http.server.test.

Patch from Chiu-Hsiang Hsu.


diff -r 70d422efa742 -r 845c79097c21 Lib/http/server.py
--- a/Lib/http/server.py	Sat Aug 15 14:38:16 2015 -0700
+++ b/Lib/http/server.py	Mon Aug 17 12:19:19 2015 +1200
@@ -1167,8 +1167,7 @@
          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 -r 70d422efa742 -r 845c79097c21 Misc/ACKS
--- a/Misc/ACKS	Sat Aug 15 14:38:16 2015 -0700
+++ b/Misc/ACKS	Mon Aug 17 12:19:19 2015 +1200
@@ -622,6 +622,7 @@
 Brad Howes
 Mike Hoy
 Ben Hoyt
+Chiu-Hsiang Hsu
 Chih-Hao Huang
 Christian Hudon
 Lawrence Hudson
diff -r 70d422efa742 -r 845c79097c21 Misc/NEWS
--- a/Misc/NEWS	Sat Aug 15 14:38:16 2015 -0700
+++ b/Misc/NEWS	Mon Aug 17 12:19:19 2015 +1200
@@ -16,6 +16,8 @@
 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.