commit ce260142c6c6eaf32775c4aec283c3a4c921b75c
author Senthil Kumaran <senthil@uthcode.com> Tue Nov 01 01:35:17 2011 +0800
committer Senthil Kumaran <senthil@uthcode.com> Tue Nov 01 01:35:17 2011 +0800
tree 6e7766ee8212602dd419064dba553ea491272063
parent 53bcd660122b6604373e5304bd014c41c8ca3e08

Fix issue 10817 - Fix urlretrieve function to raise ContentTooShortError
even when reporthook is None. Patch by Jyrki Pulliainen.

Lib/urllib/request.py

diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py
index 8ea058f..ca17da5 100644
--- a/Lib/urllib/request.py
+++ b/Lib/urllib/request.py
@@ -1589,9 +1589,9 @@
                 size = -1
                 read = 0
                 blocknum = 0
+                if "content-length" in headers:
+                    size = int(headers["Content-Length"])
                 if reporthook:
-                    if "content-length" in headers:
-                        size = int(headers["Content-Length"])
                     reporthook(blocknum, bs, size)
                 while 1:
                     block = fp.read(bs)