Merge remote-tracking branch 'matplotlib/v2.x'

tacaswell · tacaswell · commit 8758df3b8676 · 2016-08-20T19:48:42.000-04:00
Conflicts:
	lib/matplotlib/backends/web_backend/js/mpl.js
	  - indentation conflicts
	lib/matplotlib/backends/web_backend/nbagg_mpl.js
	  - deleted on the master branch (not resurrected)
	lib/matplotlib/testing/decorators.py
	  - import conflicts
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -3643,10 +3643,7 @@ def bxp(self, bxpstats, positions=None, widths=None, vert=True,
 
         def to_vc(xs, ys):
             # convert arguments to verts and codes
-            verts = []
-
-            for xi, yi in zip(xs, ys):
-                verts.append((xi, yi))
+            verts = list(zip(xs, ys))
             verts.append((0, 0))  # ignored
             codes = [mpath.Path.MOVETO] + \
                     [mpath.Path.LINETO] * (len(verts) - 2) + \
diff --git a/lib/matplotlib/backends/web_backend/js/mpl.js b/lib/matplotlib/backends/web_backend/js/mpl.js
@@ -145,11 +145,11 @@ mpl.figure.prototype._init_canvas = function() {
     this.context = canvas[0].getContext("2d");
 
     var backingStore = this.context.backingStorePixelRatio ||
-    this.context.webkitBackingStorePixelRatio ||
-    this.context.mozBackingStorePixelRatio ||
-    this.context.msBackingStorePixelRatio ||
-    this.context.oBackingStorePixelRatio ||
-    this.context.backingStorePixelRatio || 1;
+	this.context.webkitBackingStorePixelRatio ||
+	this.context.mozBackingStorePixelRatio ||
+	this.context.msBackingStorePixelRatio ||
+	this.context.oBackingStorePixelRatio ||
+	this.context.backingStorePixelRatio || 1;
 
     mpl.ratio = (window.devicePixelRatio || 1) / backingStore;
 
diff --git a/lib/matplotlib/testing/decorators.py b/lib/matplotlib/testing/decorators.py
@@ -15,6 +15,7 @@
 # allows other functions here to be used by pytest-based testing suites without
 # requiring nose to be installed.
 
+
 import matplotlib as mpl
 import matplotlib.style
 import matplotlib.units
@@ -404,6 +405,9 @@ def find_dotted_module(module_name, path=None):
 
 
 def switch_backend(backend):
+    # Local import to avoid a hard nose dependency and only incur the
+    # import time overhead at actual test-time.
+    import nose
     def switch_backend_decorator(func):
         def backend_switcher(*args, **kwargs):
             try:
diff --git a/lib/matplotlib/type1font.py b/lib/matplotlib/type1font.py
@@ -306,8 +306,7 @@ def suppress(tokens):
                  b'/FontMatrix': replace(fontmatrix),
                  b'/UniqueID': suppress}
 
-        while True:
-            token, value = next(tokens)
+        for token, value in tokens:
             if token is cls._name and value in table:
                 for value in table[value](itertools.chain([(token, value)],
                                                           tokens)):
diff --git a/setupext.py b/setupext.py
@@ -1139,19 +1139,34 @@ def do_custom_build(self):
                         pass
 
             if not os.path.isfile(tarball_path):
-                url_fmt = (
-                    'http://download.savannah.gnu.org/releases/freetype/{0}')
-                tarball_url = url_fmt.format(tarball)
 
-                print("Downloading {0}".format(tarball_url))
                 if sys.version_info[0] == 2:
                     from urllib import urlretrieve
                 else:
                     from urllib.request import urlretrieve
-
                 if not os.path.exists('build'):
                     os.makedirs('build')
-                urlretrieve(tarball_url, tarball_path)
+
+                sourceforge_url = (
+                    'http://downloads.sourceforge.net/project/freetype'
+                    '/freetype2/{0}/'.format(LOCAL_FREETYPE_VERSION)
+                )
+                url_fmts = (
+                    sourceforge_url + '{0}',
+                    'http://download.savannah.gnu.org/releases/freetype/{0}'
+                    )
+                for url_fmt in url_fmts:
+                    tarball_url = url_fmt.format(tarball)
+
+                    print("Downloading {0}".format(tarball_url))
+                    try:
+                        urlretrieve(tarball_url, tarball_path)
+                    except:
+                        print("Failed to download {0}".format(tarball_url))
+                    else:
+                        break
+                if not os.path.isfile(tarball_path):
+                    raise IOError("Failed to download freetype")
                 if get_file_hash(tarball_path) == LOCAL_FREETYPE_HASH:
                     try:
                         # this will fail on LPy, oh well
