commit 87e585581da34e0da900f3704c0cf162bc144b7d
author Senthil Kumaran <senthil@uthcode.com> Tue Nov 01 02:44:45 2011 +0800
committer Senthil Kumaran <senthil@uthcode.com> Tue Nov 01 02:44:45 2011 +0800
tree 67c97e8426979af930a80990745e3bc394248588
parent 236c0ea6142e616f3f12477a3e2837ebb494f0cd

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

Lib/urllib.py

diff --git a/Lib/urllib.py b/Lib/urllib.py
index 1d65ce5..0432ccc 100644
--- a/Lib/urllib.py
+++ b/Lib/urllib.py
@@ -257,9 +257,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)