[Python-checkins] cpython (merge default -> default): Merged upstream.

[alex.gaynor]

http://hg.python.org/cpython/rev/e5e8796b68b8
changeset:   71398:e5e8796b68b8
parent:      71397:2eb8789e30e7
parent:      71395:3cd88ae348db
user:        Alex Gaynor <alex.gaynor at gmail.com>
date:        Sun Jul 17 16:22:05 2011 -0700
summary:
  Merged upstream.

files:
  Doc/library/urllib.request.rst |  9 ++++++++-
  1 files changed, 8 insertions(+), 1 deletions(-)


diff --git a/Doc/library/urllib.request.rst b/Doc/library/urllib.request.rst
--- a/Doc/library/urllib.request.rst
+++ b/Doc/library/urllib.request.rst
@@ -931,7 +931,7 @@
 HTTPErrorProcessor Objects
 --------------------------
 
-.. method:: HTTPErrorProcessor.unknown_open()
+.. method:: HTTPErrorProcessor.http_response()
 
    Process HTTP error responses.
 
@@ -943,6 +943,13 @@
    :exc:`HTTPError` if no other handler handles the error.
 
 
+.. method:: HTTPErrorProcessor.https_response()
+
+   Process HTTPS error responses.
+
+   The behavior is same as :meth:`http_response`.
+
+
 .. _urllib-request-examples:
 
 Examples

-- 
Repository URL: http://hg.python.org/cpython