Merge lp:~gz/langpack-o-matic/fetch_tarballs_urlopen_1043846 into lp:langpack-o-matic

[Martin Packman]

Raise an exception if when fetching a tarball launchpad gives an error page. This branch basically just switches urlretrieve which ignores errors for urlopen which throws instead.

I've manually tested this with Python 2 and it appears to work, but I'm not sure if the code is exercised by the existing automated testing.

[Martin Pitt (pitti)]

Thanks for this!

review: Approve

=== modified file 'lib/static_translations.py'
--- lib/static_translations.py	2011-10-10 08:42:17 +0000
+++ lib/static_translations.py	2012-08-30 15:08:57 +0000
@@ -5,10 +5,10 @@
 import tarfile
 
 try:
-    from urllib.request import urlretrieve
+    from urllib.request import urlopen
 except ImportError:
     # python 2 fallback
-    from urllib import urlretrieve
+    from urllib2 import urlopen
 
 from macros import _file_map
 
@@ -102,10 +102,11 @@
         logging.debug('fetching tarballs...')
         for t in tarball_urls:
             logging.debug('    ' + t)
-            (dest, _) = urlretrieve(t)
-            assert subprocess.call(['tar', '-C', unpack_dir, '-xzf', dest]) == 0
-            if t != dest:
-                os.unlink(dest)
+            response = urlopen(t)
+            with tempfile.TemporaryFile() as f:
+                shutil.copyfileobj(response, f)
+                f.seek(0)
+                subprocess.check_call(['tar', '-xzC', unpack_dir], stdin=f)
 
         # rename to *-langpack
         logging.debug('renaming to *-langpack...')