summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSenthil Kumaran <orsenthil@gmail.com>2010-02-22 10:57:29 +0000
committerSenthil Kumaran <orsenthil@gmail.com>2010-02-22 10:57:29 +0000
commit38bcf8115138d95543388a1556d4dc8d1260b4be (patch)
treedc73a1132297c26fa93f51d197b82672a7d7471c
parent7ca17f0df599dae7fb11021040f2bec21461e9b7 (diff)
downloadcpython-git-38bcf8115138d95543388a1556d4dc8d1260b4be.tar.gz
Merged revisions 78299 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r78299 | senthil.kumaran | 2010-02-22 16:25:08 +0530 (Mon, 22 Feb 2010) | 4 lines Fix Issue7172 - BaseHTTPServer.BaseHTTPRequestHandler.responses[405] - changing server to resource in the 405 response msg. ........
-rw-r--r--Lib/BaseHTTPServer.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/BaseHTTPServer.py b/Lib/BaseHTTPServer.py
index acd839410e..6c0cf46b13 100644
--- a/Lib/BaseHTTPServer.py
+++ b/Lib/BaseHTTPServer.py
@@ -535,7 +535,7 @@ class BaseHTTPRequestHandler(SocketServer.StreamRequestHandler):
'Request forbidden -- authorization will not help'),
404: ('Not Found', 'Nothing matches the given URI'),
405: ('Method Not Allowed',
- 'Specified method is invalid for this server.'),
+ 'Specified method is invalid for this resource.'),
406: ('Not Acceptable', 'URI not available in preferred format.'),
407: ('Proxy Authentication Required', 'You must authenticate with '
'this proxy before proceeding.'),