MNT: minor fix ups

tacaswell · tacaswell · commit 08e9971fec9a · 2019-02-12T21:54:00.000-05:00
- remove debugging prints
 - use local backport of makedirs with exist_ok=True
 - raise exception with manual instructions if downloading fails
 - move a comment block
 - save a pass through a list comprehension
diff --git a/setup.py b/setup.py
@@ -44,7 +44,7 @@
 
 import setupext
 from setupext import (print_line, print_raw, print_message, print_status,
-                      download_or_cache)
+                      download_or_cache, makedirs as _makedirs)
 
 # Get the version from versioneer
 import versioneer
@@ -124,15 +124,13 @@ def _download_jquery_to(dest):
     url = "https://jqueryui.com/resources/download/jquery-ui-1.12.1.zip"
     sha = 'f8233674366ab36b2c34c577ec77a3d70cac75d2e387d8587f3836345c0f624d'
     if not os.path.exists(os.path.join(dest, "jquery-ui-1.12.1")):
+        _makedirs(dest, exist_ok=True)
         try:
-            os.makedirs(dest)
-        except OSError:
-            pass
-        print("DOWNLOADING JQUERY TO {}".format(dest))
-        # jQueryUI's website blocks direct downloads from urllib.request's
-        # default User-Agent, but not (for example) wget; so I don't feel too
-        # bad passing in an empty User-Agent.
-        buff = download_or_cache(url, sha)
+            buff = download_or_cache(url, sha)
+        except Exception:
+            raise IOError("Failed to download jquery-ui.  Please download " +
+                          "{url} and extract it to {dest}.".format(
+                              url=url, dest=dest))
         with ZipFile(buff) as zf:
             zf.extractall(dest)
 
diff --git a/setupext.py b/setupext.py
@@ -97,7 +97,6 @@ def get_from_cache(local_fn):
             raise Exception("no cache dir")
         cache_filename = os.path.join(cache_dir, local_fn)
         with open(cache_filename, 'rb') as fin:
-            print('opened the file')
             buf = BytesIO(fin.read())
         file_sha = get_fd_hash(buf)
         if file_sha != sha:
@@ -128,6 +127,9 @@ def write_cache(local_fn, data):
     except Exception:
         pass
 
+    # jQueryUI's website blocks direct downloads from urllib.request's
+    # default User-Agent, but not (for example) wget; so I don't feel too
+    # bad passing in an empty User-Agent.
     with urlopen(
             Request(url, headers={"User-Agent": ""})) as req:
         file_contents = BytesIO(req.read())
@@ -971,19 +973,19 @@ def do_custom_build(self):
         ]
         tarball = 'freetype-{0}.tar.gz'.format(LOCAL_FREETYPE_VERSION)
 
-        for url_fmt in url_fmts:
-            tarball_url = url_fmt.format(
-                version=LOCAL_FREETYPE_VERSION, tarball=tarball)
+        target_urls = [
+            url_fmt.format(version=LOCAL_FREETYPE_VERSION,
+                           tarball=tarball)
+            for url_fmt in url_fmts]
+
+        for tarball_url in target_urls:
             try:
                 tar_contents = download_or_cache(tarball_url,
                                                  LOCAL_FREETYPE_HASH)
                 break
             except Exception as ex:
                 raise ex
         else:
-            target_urls = [url_fmt.format(
-                version=LOCAL_FREETYPE_VERSION, tarball=tarball)
-                           for url_fmt in url_fmts]
             raise IOError("Failed to download FreeType.  Please download " +
                           "one of {target_urls} ".format(
                               target_urls=target_urls) +
