[Python-checkins] r78300 - in python/branches/release26-maint: Lib/BaseHTTPServer.py

[senthil.kumaran]

Author: senthil.kumaran
Date: Mon Feb 22 11:57:29 2010
New Revision: 78300

Log:
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.
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Lib/BaseHTTPServer.py

Modified: python/branches/release26-maint/Lib/BaseHTTPServer.py
==============================================================================
--- python/branches/release26-maint/Lib/BaseHTTPServer.py	(original)
+++ python/branches/release26-maint/Lib/BaseHTTPServer.py	Mon Feb 22 11:57:29 2010
@@ -535,7 +535,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.'),