Update & deprecate mpl_toolkits.{gtk,excel}tools.

anntzer · anntzer · commit 92ffe7d1f9ba · 2016-06-08T08:57:33.000-07:00
- On Py2, np.rec.fromarrays cannot take a unicode string as names (but
this module __future__-imports unicode_strings).

- CallbackRegistry ctor signature has changed.
diff --git a/lib/mpl_toolkits/exceltools.py b/lib/mpl_toolkits/exceltools.py
@@ -33,6 +33,10 @@
 import matplotlib.mlab as mlab
 
 
+cbook.warn_deprecated("2.0", name="mpl_toolkits.exceltools",
+                      alternative="openpyxl", obj_type="module")
+
+
 def xlformat_factory(format):
     """
     copy the format, perform any overrides, and attach an xlstyle instance
diff --git a/lib/mpl_toolkits/gtktools.py b/lib/mpl_toolkits/gtktools.py
@@ -36,6 +36,7 @@
 
 from matplotlib.externals import six
 from matplotlib.externals.six.moves import xrange, zip
+from matplotlib.cbook import warn_deprecated
 
 import copy
 import gtk, gobject
@@ -44,6 +45,9 @@
 import matplotlib.mlab as mlab
 
 
+warn_deprecated("2.0", name="mpl_toolkits.gtktools", obj_type="module")
+
+
 def error_message(msg, parent=None, title=None):
     """
     create an error message dialog with string msg.  Optionally set
@@ -387,7 +391,7 @@ def __init__(self, r, formatd=None, stringd=None):
             formatd = mlab.get_formatd(r)
 
         self.stringd = stringd
-        self.callbacks = cbook.CallbackRegistry(['cell_changed'])
+        self.callbacks = cbook.CallbackRegistry()
 
         self.r = r
 
@@ -599,7 +603,7 @@ def edit_recarray(r, formatd=None, stringd=None, constant=None, autowin=True):
     clientid = list(xrange(N))                                   # ints
 
     r = np.rec.fromarrays([clientid, dates, weekdays, gains, prices, up],
-                          names='clientid,date,weekdays,gains,prices,up')
+                          names=str('clientid,date,weekdays,gains,prices,up'))
 
     # some custom formatters
     formatd = mlab.get_formatd(r)
