Merge 1.4.x into master

tacaswell · tacaswell · commit f5d2f45f1108 · 2014-10-10T12:52:19.000-04:00
Conflicts: lib/matplotlib/__init__.py conflict between version bump and the fix for unicode breaking LooseVersion (b91be6c)
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -106,8 +106,9 @@
 import sys
 import distutils.version
 
-__version__ = '1.5.x'
-__version__numpy__ = '1.6'  # minimum required numpy version
+__version__ = str('1.5.x')
+__version__numpy__ = str('1.6')  # minimum required numpy version
+
 
 try:
     import dateutil
@@ -1322,12 +1323,7 @@ def interactive(b):
 
 def is_interactive():
     'Return true if plot mode is interactive'
-    # ps1 exists if the python interpreter is running in an
-    # interactive console; sys.flags.interactive is true if a script
-    # is being run via "python -i".
-    b = rcParams['interactive'] and (
-        hasattr(sys, 'ps1') or sys.flags.interactive)
-    return b
+    return rcParams['interactive']
 
 
 def tk_window_focus():
diff --git a/lib/matplotlib/backends/backend_agg.py b/lib/matplotlib/backends/backend_agg.py
@@ -104,6 +104,14 @@ def __init__(self, width, height, dpi):
         if __debug__: verbose.report('RendererAgg.__init__ done',
                                      'debug-annoying')
 
+    def __getstate__(self):
+        # We only want to preserve the init keywords of the Renderer.
+        # Anything else can be re-created.
+        return {'width': self.width, 'height': self.height, 'dpi': self.dpi}
+
+    def __setstate__(self, state):
+        self.__init__(state['width'], state['height'], state['dpi'])
+
     def _get_hinting_flag(self):
         if rcParams['text.hinting']:
             return LOAD_FORCE_AUTOHINT
diff --git a/lib/matplotlib/backends/backend_nbagg.py b/lib/matplotlib/backends/backend_nbagg.py
@@ -81,14 +81,17 @@ def connection_info():
     return '\n'.join(result)
 
 
-# Note: Version 3.2 icons, not the later 4.0 ones.
+# Note: Version 3.2 and 4.x icons
 # http://fontawesome.io/3.2.1/icons/
+# http://fontawesome.io/
+# the `fa fa-xxx` part targets font-awesome 4, (IPython 3.x)
+# the icon-xxx targets font awesome 3.21 (IPython 2.x)
 _FONT_AWESOME_CLASSES = {
-    'home': 'icon-home',
-    'back': 'icon-arrow-left',
-    'forward': 'icon-arrow-right',
-    'zoom_to_rect': 'icon-check-empty',
-    'move': 'icon-move',
+    'home': 'fa fa-home icon-home',
+    'back': 'fa fa-arrow-left icon-arrow-left',
+    'forward': 'fa fa-arrow-right icon-arrow-right',
+    'zoom_to_rect': 'fa fa-square-o icon-check-empty',
+    'move': 'fa fa-arrows icon-move',
     None: None
 }
 
diff --git a/lib/matplotlib/backends/backend_ps.py b/lib/matplotlib/backends/backend_ps.py
@@ -764,7 +764,7 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None):
             except KeyError:
                 ps_name = sfnt[(3,1,0x0409,6)].decode(
                     'utf-16be')
-            ps_name = ps_name.encode('ascii', 'replace')
+            ps_name = ps_name.encode('ascii', 'replace').decode('ascii')
             self.set_font(ps_name, prop.get_size_in_points())
 
             cmap = font.get_charmap()
diff --git a/lib/matplotlib/backends/backend_webagg_core.py b/lib/matplotlib/backends/backend_webagg_core.py
@@ -315,7 +315,7 @@ def draw_rubberband(self, event, x0, y0, x1, y1):
             "rubberband", x0=x0, y0=y0, x1=x1, y1=y1)
 
     def release_zoom(self, event):
-        super(NavigationToolbar2WebAgg, self).release_zoom(event)
+        backend_bases.NavigationToolbar2.release_zoom(self, event)
         self.canvas.send_event(
             "rubberband", x0=-1, y0=-1, x1=-1, y1=-1)
 
diff --git a/lib/matplotlib/backends/web_backend/nbagg_mpl.js b/lib/matplotlib/backends/web_backend/nbagg_mpl.js
@@ -115,7 +115,7 @@ mpl.figure.prototype._init_toolbar = function() {
 
     // Add the close button to the window.
     var buttongrp = $('<div class="btn-group inline pull-right"></div>');
-    var button = $('<button class="btn btn-mini btn-danger" href="#" title="Close figure"><i class="fa icon-remove icon-large"></i></button>');
+    var button = $('<button class="btn btn-mini btn-danger" href="#" title="Close figure"><i class="fa fa-times icon-remove icon-large"></i></button>');
     button.click(function (evt) { fig.handle_close(fig, {}); } );
     button.mouseover('Close figure', toolbar_mouse_event);
     buttongrp.append(button);
diff --git a/lib/matplotlib/image.py b/lib/matplotlib/image.py
@@ -10,10 +10,8 @@
 
 import os
 import warnings
-import math
 
 import numpy as np
-from numpy import ma
 
 from matplotlib import rcParams
 import matplotlib.artist as martist
@@ -113,6 +111,12 @@ def __init__(self, ax,
 
         self.update(kwargs)
 
+    def __getstate__(self):
+        state = super(_AxesImageBase, self).__getstate__()
+        # We can't pickle the C Image cached object.
+        state.pop('_imcache', None)
+        return state
+
     def get_size(self):
         """Get the numrows, numcols of the input image"""
         if self._A is None:
diff --git a/lib/matplotlib/lines.py b/lib/matplotlib/lines.py
@@ -352,6 +352,12 @@ def __init__(self, xdata, ydata,
         self._invalidy = True
         self.set_data(xdata, ydata)
 
+    def __getstate__(self):
+        state = super(Line2D, self).__getstate__()
+        # _linefunc will be restored on draw time.
+        state.pop('_lineFunc', None)
+        return state
+
     def contains(self, mouseevent):
         """
         Test whether the mouse event occurred on the line.  The pick
diff --git a/lib/matplotlib/tests/test_pickle.py b/lib/matplotlib/tests/test_pickle.py
@@ -107,6 +107,8 @@ def test_simple():
     plt.plot(list(xrange(10)), label='foobar')
     plt.legend()
 
+    # Uncomment to debug any unpicklable objects. This is slow so is not
+    # uncommented by default.
 #    recursive_pickle(fig)
     pickle.dump(ax, BytesIO(), pickle.HIGHEST_PROTOCOL)
 
@@ -195,17 +197,47 @@ def test_complete():
 
 def test_no_pyplot():
     # tests pickle-ability of a figure not created with pyplot
-
-    import pickle as p
     from matplotlib.backends.backend_pdf import FigureCanvasPdf as fc
     from matplotlib.figure import Figure
 
     fig = Figure()
-    can = fc(fig)
+    _ = fc(fig)
     ax = fig.add_subplot(1, 1, 1)
     ax.plot([1, 2, 3], [1, 2, 3])
-
-    # Uncomment to debug any unpicklable objects. This is slow so is not
-    # uncommented by default.
-#    recursive_pickle(fig)
     pickle.dump(fig, BytesIO(), pickle.HIGHEST_PROTOCOL)
+
+
+def test_renderer():
+    from matplotlib.backends.backend_agg import RendererAgg
+    renderer = RendererAgg(10, 20, 30)
+    pickle.dump(renderer, BytesIO())
+
+
+def test_image():
+    # Prior to v1.4.0 the Image would cache data which was not picklable
+    # once it had been drawn.
+    from matplotlib.backends.backend_agg import new_figure_manager
+    manager = new_figure_manager(1000)
+    fig = manager.canvas.figure
+    ax = fig.add_subplot(1, 1, 1)
+    ax.imshow(np.arange(12).reshape(3, 4))
+    manager.canvas.draw()
+    pickle.dump(fig, BytesIO())
+
+
+def test_grid():
+    from matplotlib.backends.backend_agg import new_figure_manager
+    manager = new_figure_manager(1000)
+    fig = manager.canvas.figure
+    ax = fig.add_subplot(1, 1, 1)
+    ax.grid()
+    # Drawing the grid triggers instance methods to be attached
+    # to the Line2D object (_lineFunc).
+    manager.canvas.draw()
+
+    pickle.dump(ax, BytesIO())
+
+
+if __name__ == '__main__':
+    import nose
+    nose.runmodule(argv=['-s'])
diff --git a/lib/matplotlib/widgets.py b/lib/matplotlib/widgets.py
@@ -439,7 +439,7 @@ def set_val(self, val):
         self.poly.xy = xy
         self.valtext.set_text(self.valfmt % val)
         if self.drawon:
-            self.ax.figure.canvas.draw()
+            self.ax.figure.canvas.draw_idle()
         self.val = val
         if not self.eventson:
             return
@@ -1025,7 +1025,7 @@ def __init__(self, canvas, axes, useblit=True, horizOn=False, vertOn=True,
         self.background = None
         self.needclear = False
 
-        if useblit:
+        if self.useblit:
             lineprops['animated'] = True
 
         if vertOn:
@@ -1219,6 +1219,9 @@ def new_axes(self, ax):
 
     def ignore(self, event):
         """return *True* if *event* should be ignored"""
+        # If canvas was locked
+        if not self.canvas.widgetlock.available(self):
+            return True
         widget_off = not self.visible or not self.active
         non_event = event.inaxes != self.ax or event.button != 1
         return widget_off or non_event
