changeset:   97402:d9e0c82d8653
branch:      3.4
parent:      97386:cce226356477
user:        Robert Collins <rbtcollins@hp.com>
date:        Mon Aug 17 12:18:35 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 cce226356477 -r d9e0c82d8653 Lib/http/server.py
--- a/Lib/http/server.py	Fri Aug 14 16:59:42 2015 -0400
+++ b/Lib/http/server.py	Mon Aug 17 12:18:35 2015 +1200
@@ -1211,8 +1211,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 cce226356477 -r d9e0c82d8653 Misc/ACKS
--- a/Misc/ACKS	Fri Aug 14 16:59:42 2015 -0400
+++ b/Misc/ACKS	Mon Aug 17 12:18:35 2015 +1200
@@ -610,6 +610,7 @@
 Ken Howard
 Brad Howes
 Mike Hoy
+Chiu-Hsiang Hsu
 Chih-Hao Huang
 Christian Hudon
 Lawrence Hudson
diff -r cce226356477 -r d9e0c82d8653 Misc/NEWS
--- a/Misc/NEWS	Fri Aug 14 16:59:42 2015 -0400
+++ b/Misc/NEWS	Mon Aug 17 12:18:35 2015 +1200
@@ -75,6 +75,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.