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.
........
................
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 @@
'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.'),