[Python-checkins] cpython (merge 3.2 -> default): Merged fix for #13211 from 3.2

Sat Dec 3 15:46:18 CET 2011

http://hg.python.org/cpython/rev/deb60efd32eb
changeset: 73824:deb60efd32eb
parent: 73821:51af35bd46f7
parent: 73823:abfe76a19f63
user: Jason R. Coombs <jaraco at jaraco.com>
date: Sat Dec 03 09:39:58 2011 -0500
summary:
 Merged fix for #13211 from 3.2
files:
 Lib/test/test_urllib2.py | 11 +++++++++++
 Lib/urllib/error.py | 6 ++++++
 2 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py
--- a/Lib/test/test_urllib2.py
+++ b/Lib/test/test_urllib2.py
@@ -1449,6 +1449,17 @@
 req = Request(url)
 self.assertEqual(req.get_full_url(), url)
 
+def test_HTTPError_interface():
+ """
+ Issue 13211 reveals that HTTPError didn't implement the URLError
+ interface even though HTTPError is a subclass of URLError.
+
+ >>> err = urllib.error.HTTPError(msg='something bad happened', url=None, code=None, hdrs=None, fp=None)
+ >>> assert hasattr(err, 'reason')
+ >>> err.reason
+ 'something bad happened'
+ """
+
 def test_main(verbose=None):
 from test import test_urllib2
 support.run_doctest(test_urllib2, verbose)
diff --git a/Lib/urllib/error.py b/Lib/urllib/error.py
--- a/Lib/urllib/error.py
+++ b/Lib/urllib/error.py
@@ -55,6 +55,12 @@
 def __str__(self):
 return 'HTTP Error %s: %s' % (self.code, self.msg)
 
+ # since URLError specifies a .reason attribute, HTTPError should also
+ # provide this attribute. See issue13211 for discussion.
+ @property
+ def reason(self):
+ return self.msg
+
 # exception raised when downloaded size does not match content-length
 class ContentTooShortError(URLError):
 def __init__(self, message, content):
-- 
Repository URL: http://hg.python.org/cpython
