merge with 3.4

birkenfeld · birkenfeld · commit 9f2e0d6a86c8 · 2014-11-06T15:33:35.000+01:00
diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
@@ -1029,7 +1029,12 @@ def check_valid_file(fn):
     requires('urlfetch')
 
     print('\tfetching %s ...' % url, file=get_original_stdout())
-    f = urllib.request.urlopen(url, timeout=15)
+    opener = urllib.request.build_opener()
+    if gzip:
+        opener.addheaders.append(('Accept-Encoding', 'gzip'))
+    f = opener.open(url, timeout=15)
+    if gzip and f.headers.get('Content-Encoding') == 'gzip':
+        f = gzip.GzipFile(fileobj=f)
     try:
         with open(fn, "wb") as out:
             s = f.read()
