summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2008-01-26 11:23:13 (GMT)
committerGeorg Brandl <georg@python.org>2008-01-26 11:23:13 (GMT)
commite3777b4e92a0d0267f4556e1ba40a5d6b5c601b8 (patch)
tree7f8325164f45cba28f4debfc4cf88693d317c7d1
parent95ba46962636c1925341120da30f124b1c4ef670 (diff)
downloadcpython-e3777b4e92a0d0267f4556e1ba40a5d6b5c601b8.zip
cpython-e3777b4e92a0d0267f4556e1ba40a5d6b5c601b8.tar.gz
cpython-e3777b4e92a0d0267f4556e1ba40a5d6b5c601b8.tar.bz2
Fix merge glitch that let test_urllib fail.
-rw-r--r--Lib/urllib.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/urllib.py b/Lib/urllib.py
index f9c8ec0..0b66e59 100644
--- a/Lib/urllib.py
+++ b/Lib/urllib.py
@@ -360,7 +360,8 @@ class URLopener:
# According to RFC 2616, "2xx" code indicates that the client's
# request was successfully received, understood, and accepted.
if (200 <= response.status < 300):
- return addinfourl(response.fp, response.msg, "http:" + url)
+ return addinfourl(response.fp, response.msg, "http:" + url,
+ response.status)
else:
return self.http_error(
url, response.fp,