[Python-checkins] r78302 - in python/branches/release31-maint: Lib/http/server.py

Mon Feb 22 12:02:53 CET 2010

Author: senthil.kumaran
Date: Mon Feb 22 12:02:53 2010
New Revision: 78302
Log:
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 (2010年2月22日) | 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 (2010年2月22日) | 4 lines
 
 Fix Issue7172 - BaseHTTPServer.BaseHTTPRequestHandler.responses[405] - changing
 server to resource in the 405 response msg.
 ........
................
Modified:
 python/branches/release31-maint/ (props changed)
 python/branches/release31-maint/Lib/http/server.py
Modified: python/branches/release31-maint/Lib/http/server.py
==============================================================================

--- python/branches/release31-maint/Lib/http/server.py	(original)
+++ python/branches/release31-maint/Lib/http/server.py	Mon Feb 22 12:02:53 2010
@@ -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.'),
