summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSenthil Kumaran <orsenthil@gmail.com>2010-02-22 11:02:53 (GMT)
committerSenthil Kumaran <orsenthil@gmail.com>2010-02-22 11:02:53 (GMT)
commit613c61c7411a9a4afef729981b124474b840b0ad (patch)
treee7e37f9e7442e6d503d1b136b3a9af6de212d426
parent6328f41d47dd8e7ca22a76056dd0c1a579e54ac8 (diff)
downloadcpython-613c61c7411a9a4afef729981b124474b840b0ad.zip
cpython-613c61c7411a9a4afef729981b124474b840b0ad.tar.gz
cpython-613c61c7411a9a4afef729981b124474b840b0ad.tar.bz2
Merged revisions 78301 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r78301 | senthil.kumaran | 2010-02-22 16:30:50 +0530 (Mon, 22 Feb 2010) | 10 lines 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/http/server.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/http/server.py b/Lib/http/server.py
index 797179a..f6f788f 100644
--- a/Lib/http/server.py
+++ b/Lib/http/server.py
@@ -555,7 +555,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.'),