merge from 3.2 - Fix issue 10817 - Fix urlretrieve function to raise ContentTooShortError

even when reporthook is None. Patch by Jyrki Pulliainen.

diff --cc Lib/test/test_urllib.py
Simple merge

diff --cc Lib/urllib/request.py
Simple merge

diff --cc Misc/NEWS
Simple merge