[Python-checkins] cpython (merge 3.5 -> default): Issue #24774: Fix docstring in http.server.test.

[robert.collins]

https://hg.python.org/cpython/rev/a8de693ebe66
changeset:   97404:a8de693ebe66
parent:      97401:f41ac4368e65
parent:      97403:845c79097c21
user:        Robert Collins <rbtcollins at hp.com>
date:        Mon Aug 17 12:19:35 2015 +1200
summary:
  Issue #24774: Fix docstring in http.server.test.

Patch from Chiu-Hsiang Hsu.

files:
  Lib/http/server.py |  3 +--
  Misc/ACKS          |  1 +
  Misc/NEWS          |  2 ++
  3 files changed, 4 insertions(+), 2 deletions(-)


diff --git a/Lib/http/server.py b/Lib/http/server.py
--- a/Lib/http/server.py
+++ b/Lib/http/server.py
@@ -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 --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -622,6 +622,7 @@
 Brad Howes
 Mike Hoy
 Ben Hoyt
+Chiu-Hsiang Hsu
 Chih-Hao Huang
 Christian Hudon
 Lawrence Hudson
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -22,6 +22,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.
 

-- 
Repository URL: https://hg.python.org/cpython