summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorSenthil Kumaran <orsenthil@gmail.com>2010-02-22 11:00:50 (GMT)
committerSenthil Kumaran <orsenthil@gmail.com>2010-02-22 11:00:50 (GMT)
commit7aa2621720f49666240e3339b5120b35f8ea00ed (patch)
tree904c6d811fb6f6f8ffe9f191a17f273eeabc5f45 /Lib
parent7869a4403cc45bdc87a1dbc3f55e3175d9e34548 (diff)
downloadcpython-7aa2621720f49666240e3339b5120b35f8ea00ed.zip
cpython-7aa2621720f49666240e3339b5120b35f8ea00ed.tar.gz
cpython-7aa2621720f49666240e3339b5120b35f8ea00ed.tar.bz2
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. ........
Diffstat (limited to 'Lib')
-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 1e640fa..d2a685f 100644
--- a/Lib/http/server.py
+++ b/Lib/http/server.py
@@ -563,7 +563,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.'),