[Python-checkins] cpython (merge 3.3 -> default): Reverting the changeset b87792757ee8 made for Issue #12921

[senthil.kumaran]

http://hg.python.org/cpython/rev/b0890674bc21
changeset:   82497:b0890674bc21
parent:      82493:b87792757ee8
parent:      82496:84e7a7f6ddb8
user:        Senthil Kumaran <senthil at uthcode.com>
date:        Tue Mar 05 02:28:18 2013 -0800
summary:
  Reverting the changeset b87792757ee8  made for Issue #12921

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


diff --git a/Lib/http/server.py b/Lib/http/server.py
--- a/Lib/http/server.py
+++ b/Lib/http/server.py
@@ -426,7 +426,7 @@
         content = (self.error_message_format %
                    {'code': code, 'message': _quote_html(message), 'explain': explain})
         body = content.encode('UTF-8', 'replace')
-        self.send_response(code, shortmsg)
+        self.send_response(code, message)
         self.send_header("Content-Type", self.error_content_type)
         self.send_header('Connection', 'close')
         self.send_header('Content-Length', int(len(body)))
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -275,10 +275,6 @@
 Library
 -------
 
-- Issue #12921: BaseHTTPServer's send_error should send the correct error
-  response message when  send_error includes a message in addition to error
-  status. Patch submitted by Karl.
-
 - Issue #17278: Fix a crash in heapq.heappush() and heapq.heappop() when
   the list is being resized concurrently.
 

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