[Python-checkins] r42455 - in python/trunk: Doc/lib/libhttplib.tex Doc/lib/liburllib2.tex Lib/BaseHTTPServer.py Lib/httplib.py Lib/urllib2.py
georg.brandl
python-checkins at python.org
Fri Feb 17 20:17:26 CET 2006
Author: georg.brandl
Date: Fri Feb 17 20:17:25 2006
New Revision: 42455
Modified:
python/trunk/Doc/lib/libhttplib.tex
python/trunk/Doc/lib/liburllib2.tex
python/trunk/Lib/BaseHTTPServer.py
python/trunk/Lib/httplib.py
python/trunk/Lib/urllib2.py
Log:
Move "httpresponses" dict from urllib2 to httplib where it belongs.
Modified: python/trunk/Doc/lib/libhttplib.tex
==============================================================================
--- python/trunk/Doc/lib/libhttplib.tex (original)
+++ python/trunk/Doc/lib/libhttplib.tex Fri Feb 17 20:17:25 2006
@@ -288,6 +288,14 @@
{An HTTP Extension Framework, \rfc{2774}, Section 7}
\end{tableiii}
+\begin{datadesc}{responses}
+This dictionary maps the HTTP 1.1 status codes to the W3C names.
+
+Example: \code{httplib.responses[httplib.NOT_FOUND]} is \code{'Not Found'}.
+\versionadded{2.5}
+\end{datadesc}
+
+
\subsection{HTTPConnection Objects \label{httpconnection-objects}}
\class{HTTPConnection} instances have the following methods:
Modified: python/trunk/Doc/lib/liburllib2.tex
==============================================================================
--- python/trunk/Doc/lib/liburllib2.tex (original)
+++ python/trunk/Doc/lib/liburllib2.tex Fri Feb 17 20:17:25 2006
@@ -71,15 +71,6 @@
\end{funcdesc}
-The following attribute is defined:
-
-\begin{datadesc}{httpresponses}
-A mapping between HTTP status codes and the W3C names.
-
-Example: \code{urllib2.httpresponses[404]} is \code{'Not Found'}.
-\versionadded{2.5}
-\end{datadesc}
-
The following exceptions are raised as appropriate:
\begin{excdesc}{URLError}
Modified: python/trunk/Lib/BaseHTTPServer.py
==============================================================================
--- python/trunk/Lib/BaseHTTPServer.py (original)
+++ python/trunk/Lib/BaseHTTPServer.py Fri Feb 17 20:17:25 2006
@@ -483,7 +483,7 @@
# Table mapping response codes to messages; entries have the
# form {code: (shortmessage, longmessage)}.
- # See http://www.w3.org/hypertext/WWW/Protocols/HTTP/HTRESP.html
+ # See RFC 2616.
responses = {
100: ('Continue', 'Request received, please continue'),
101: ('Switching Protocols',
@@ -494,7 +494,7 @@
202: ('Accepted',
'Request accepted, processing continues off-line'),
203: ('Non-Authoritative Information', 'Request fulfilled from cache'),
- 204: ('No response', 'Request fulfilled, nothing follows'),
+ 204: ('No Content', 'Request fulfilled, nothing follows'),
205: ('Reset Content', 'Clear input form for further input.'),
206: ('Partial Content', 'Partial content follows.'),
@@ -503,7 +503,7 @@
301: ('Moved Permanently', 'Object moved permanently -- see URI list'),
302: ('Found', 'Object moved temporarily -- see URI list'),
303: ('See Other', 'Object moved -- see Method and URL list'),
- 304: ('Not modified',
+ 304: ('Not Modified',
'Document has not changed since given time'),
305: ('Use Proxy',
'You must use proxy specified in Location to access this '
@@ -511,11 +511,11 @@
307: ('Temporary Redirect',
'Object moved temporarily -- see URI list'),
- 400: ('Bad request',
+ 400: ('Bad Request',
'Bad request syntax or unsupported method'),
401: ('Unauthorized',
'No permission -- see authorization schemes'),
- 402: ('Payment required',
+ 402: ('Payment Required',
'No payment -- see charging schemes'),
403: ('Forbidden',
'Request forbidden -- authorization will not help'),
@@ -525,7 +525,7 @@
406: ('Not Acceptable', 'URI not available in preferred format.'),
407: ('Proxy Authentication Required', 'You must authenticate with '
'this proxy before proceeding.'),
- 408: ('Request Time-out', 'Request timed out; try again later.'),
+ 408: ('Request Timeout', 'Request timed out; try again later.'),
409: ('Conflict', 'Request conflict.'),
410: ('Gone',
'URI no longer exists and has been permanently removed.'),
@@ -539,15 +539,15 @@
417: ('Expectation Failed',
'Expect condition could not be satisfied.'),
- 500: ('Internal error', 'Server got itself in trouble'),
+ 500: ('Internal Server Error', 'Server got itself in trouble'),
501: ('Not Implemented',
'Server does not support this operation'),
502: ('Bad Gateway', 'Invalid responses from another server/proxy.'),
- 503: ('Service temporarily overloaded',
+ 503: ('Service Unavailable',
'The server cannot process the request due to a high load'),
- 504: ('Gateway timeout',
+ 504: ('Gateway Timeout',
'The gateway server did not receive a timely response'),
- 505: ('HTTP Version not supported', 'Cannot fulfill request.'),
+ 505: ('HTTP Version Not Supported', 'Cannot fulfill request.'),
}
Modified: python/trunk/Lib/httplib.py
==============================================================================
--- python/trunk/Lib/httplib.py (original)
+++ python/trunk/Lib/httplib.py Fri Feb 17 20:17:25 2006
@@ -81,7 +81,7 @@
"UnknownTransferEncoding", "UnimplementedFileMode",
"IncompleteRead", "InvalidURL", "ImproperConnectionState",
"CannotSendRequest", "CannotSendHeader", "ResponseNotReady",
- "BadStatusLine", "error"]
+ "BadStatusLine", "error", "responses"]
HTTP_PORT = 80
HTTPS_PORT = 443
@@ -153,6 +153,55 @@
INSUFFICIENT_STORAGE = 507
NOT_EXTENDED = 510
+# Mapping status codes to official W3C names
+responses = {
+ 100: 'Continue',
+ 101: 'Switching Protocols',
+
+ 200: 'OK',
+ 201: 'Created',
+ 202: 'Accepted',
+ 203: 'Non-Authoritative Information',
+ 204: 'No Content',
+ 205: 'Reset Content',
+ 206: 'Partial Content',
+
+ 300: 'Multiple Choices',
+ 301: 'Moved Permanently',
+ 302: 'Found',
+ 303: 'See Other',
+ 304: 'Not Modified',
+ 305: 'Use Proxy',
+ 306: '(Unused)',
+ 307: 'Temporary Redirect',
+
+ 400: 'Bad Request',
+ 401: 'Unauthorized',
+ 402: 'Payment Required',
+ 403: 'Forbidden',
+ 404: 'Not Found',
+ 405: 'Method Not Allowed',
+ 406: 'Not Acceptable',
+ 407: 'Proxy Authentication Required',
+ 408: 'Request Timeout',
+ 409: 'Conflict',
+ 410: 'Gone',
+ 411: 'Length Required',
+ 412: 'Precondition Failed',
+ 413: 'Request Entity Too Large',
+ 414: 'Request-URI Too Long',
+ 415: 'Unsupported Media Type',
+ 416: 'Requested Range Not Satisfiable',
+ 417: 'Expectation Failed',
+
+ 500: 'Internal Server Error',
+ 501: 'Not Implemented',
+ 502: 'Bad Gateway',
+ 503: 'Service Unavailable',
+ 504: 'Gateway Timeout',
+ 505: 'HTTP Version Not Supported',
+}
+
# maximal amount of data to read at one time in _safe_read
MAXAMOUNT = 1048576
Modified: python/trunk/Lib/urllib2.py
==============================================================================
--- python/trunk/Lib/urllib2.py (original)
+++ python/trunk/Lib/urllib2.py Fri Feb 17 20:17:25 2006
@@ -1296,51 +1296,4 @@
ph = ph()
opener.add_handler(ph)
-# Mapping status codes to official W3C names
-httpresponses = {
- 100: 'Continue',
- 101: 'Switching Protocols',
- 200: 'OK',
- 201: 'Created',
- 202: 'Accepted',
- 203: 'Non-Authoritative Information',
- 204: 'No Content',
- 205: 'Reset Content',
- 206: 'Partial Content',
-
- 300: 'Multiple Choices',
- 301: 'Moved Permanently',
- 302: 'Found',
- 303: 'See Other',
- 304: 'Not Modified',
- 305: 'Use Proxy',
- 306: '(Unused)',
- 307: 'Temporary Redirect',
-
- 400: 'Bad Request',
- 401: 'Unauthorized',
- 402: 'Payment Required',
- 403: 'Forbidden',
- 404: 'Not Found',
- 405: 'Method Not Allowed',
- 406: 'Not Acceptable',
- 407: 'Proxy Authentication Required',
- 408: 'Request Timeout',
- 409: 'Conflict',
- 410: 'Gone',
- 411: 'Length Required',
- 412: 'Precondition Failed',
- 413: 'Request Entity Too Large',
- 414: 'Request-URI Too Long',
- 415: 'Unsupported Media Type',
- 416: 'Requested Range Not Satisfiable',
- 417: 'Expectation Failed',
-
- 500: 'Internal Server Error',
- 501: 'Not Implemented',
- 502: 'Bad Gateway',
- 503: 'Service Unavailable',
- 504: 'Gateway Timeout',
- 505: 'HTTP Version Not Supported',
-}
More information about the Python-checkins
mailing list