Merge branch 'v2.0.x'

mdboom · mdboom · commit a7b76bcc1f97 · 2015-11-04T13:56:44.000-05:00
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -3008,7 +3008,7 @@ def xywhere(xs, ys, mask):
                     caplines.extend(self.plot(xup, yup, 'k_', **plot_kw))
 
         if not barsabove and plot_line:
-            l0, = self.plot(x, y, fmt, **kwargs)
+            l0, = self.plot(x, y, fmt, label='_nolegend_', **kwargs)
 
         if ecolor is None:
             if l0 is None and 'color' in self._get_lines._prop_keys:
diff --git a/lib/matplotlib/backends/backend_webagg_core.py b/lib/matplotlib/backends/backend_webagg_core.py
@@ -22,6 +22,7 @@
 import warnings
 
 import numpy as np
+import tornado
 
 from matplotlib.backends import backend_agg
 from matplotlib.figure import Figure
