ENH matplolib's example now uses the new utils module, instead of the deprecated cbook module

NelleV · NelleV · commit 18572403a94e · 2013-02-01T10:37:14.000+01:00
diff --git a/examples/animation/old_animation/draggable_legend.py b/examples/animation/old_animation/draggable_legend.py
@@ -16,7 +16,7 @@
 
 
 from matplotlib._png import read_png
-from matplotlib._cbook import get_sample_data
+from matplotlib.utils import get_sample_data
 
 from matplotlib.offsetbox import OffsetImage, AnnotationBbox
 
diff --git a/examples/api/date_demo.py b/examples/api/date_demo.py
@@ -15,7 +15,7 @@
 import numpy as np
 import matplotlib.pyplot as plt
 import matplotlib.dates as mdates
-import matplotlib._cbook as _cbook
+import matplotlib.utils as utils 
 
 years    = mdates.YearLocator()   # every year
 months   = mdates.MonthLocator()  # every month
@@ -25,7 +25,7 @@
 # open, close, volume, adj_close from the mpl-data/example directory.
 # The record array stores python datetime.date as an object array in
 # the date column
-datafile = _cbook.get_sample_data('goog.npy')
+datafile = utils.get_sample_data('goog.npy')
 r = np.load(datafile).view(np.recarray)
 
 fig = plt.figure()
diff --git a/examples/api/date_index_formatter.py b/examples/api/date_index_formatter.py
@@ -7,10 +7,10 @@
 import numpy as np
 import matplotlib.pyplot as plt
 import matplotlib.mlab as mlab
-import matplotlib._cbook as _cbook
+import matplotlib.utils as utils 
 import matplotlib.ticker as ticker
 
-datafile = _cbook.get_sample_data('aapl.csv', asfileobj=False)
+datafile = utils.get_sample_data('aapl.csv', asfileobj=False)
 print ('loading %s' % datafile)
 r = mlab.csv2rec(datafile)
 
diff --git a/examples/api/watermark_image.py b/examples/api/watermark_image.py
@@ -4,11 +4,11 @@
 from __future__ import print_function
 import numpy as np
 import matplotlib
-import matplotlib._cbook as _cbook
+import matplotlib.utils as utils
 import matplotlib.image as image
 import matplotlib.pyplot as plt
 
-datafile = _cbook.get_sample_data('logo2.png', asfileobj=False)
+datafile = utils.get_sample_data('logo2.png', asfileobj=False)
 print ('loading %s' % datafile)
 im = image.imread(datafile)
 im[:,:,-1] = 0.5  # set the alpha channel
diff --git a/examples/axes_grid/demo_axes_divider.py b/examples/axes_grid/demo_axes_divider.py
@@ -2,7 +2,7 @@
 
 def get_demo_image():
     import numpy as np
-    from matplotlib._cbook import get_sample_data
+    from matplotlib.utils import get_sample_data
     f = get_sample_data("axes_grid/bivariate_normal.npy", asfileobj=False)
     z = np.load(f)
     # z is a numpy array of 15x15
diff --git a/examples/axes_grid/demo_axes_grid.py b/examples/axes_grid/demo_axes_grid.py
@@ -3,7 +3,7 @@
 
 def get_demo_image():
     import numpy as np
-    from matplotlib._cbook import get_sample_data
+    from matplotlib.utils import get_sample_data
     f = get_sample_data("axes_grid/bivariate_normal.npy", asfileobj=False)
     z = np.load(f)
     # z is a numpy array of 15x15
diff --git a/examples/axes_grid/demo_axes_grid2.py b/examples/axes_grid/demo_axes_grid2.py
@@ -3,7 +3,7 @@
 import numpy as np
 
 def get_demo_image():
-    from matplotlib._cbook import get_sample_data
+    from matplotlib.utils import get_sample_data
     f = get_sample_data("axes_grid/bivariate_normal.npy", asfileobj=False)
     z = np.load(f)
     # z is a numpy array of 15x15
diff --git a/examples/axes_grid/demo_axes_rgb.py b/examples/axes_grid/demo_axes_rgb.py
@@ -4,7 +4,7 @@
 from mpl_toolkits.axes_grid1.axes_rgb import make_rgb_axes, RGBAxes
 
 def get_demo_image():
-    from matplotlib._cbook import get_sample_data
+    from matplotlib.utils import get_sample_data
     f = get_sample_data("axes_grid/bivariate_normal.npy", asfileobj=False)
     z = np.load(f)
     # z is a numpy array of 15x15
diff --git a/examples/axes_grid/demo_curvelinear_grid.py b/examples/axes_grid/demo_curvelinear_grid.py
@@ -2,7 +2,7 @@
 #from matplotlib.path import Path
 
 import matplotlib.pyplot as plt
-import matplotlib._cbook as _cbook
+import matplotlib.utils as utils 
 
 from  mpl_toolkits.axisartist.grid_helper_curvelinear import GridHelperCurveLinear
 from mpl_toolkits.axisartist import Subplot
@@ -109,7 +109,7 @@ def curvelinear_test2(fig):
     # note that ax2.transData == tr + ax1.transData
     # Anthing you draw in ax2 will match the ticks and grids of ax1.
     ax1.parasites.append(ax2)
-    intp = _cbook.simple_linear_interpolation
+    intp = utils.simple_linear_interpolation
     ax2.plot(intp(np.array([0, 30]), 50),
              intp(np.array([10., 10.]), 50))
 
diff --git a/examples/axes_grid/demo_edge_colorbar.py b/examples/axes_grid/demo_edge_colorbar.py
@@ -3,7 +3,7 @@
 
 def get_demo_image():
     import numpy as np
-    from matplotlib._cbook import get_sample_data
+    from matplotlib.utils import get_sample_data
     f = get_sample_data("axes_grid/bivariate_normal.npy", asfileobj=False)
     z = np.load(f)
     # z is a numpy array of 15x15
diff --git a/examples/axes_grid/inset_locator_demo2.py b/examples/axes_grid/inset_locator_demo2.py
@@ -6,7 +6,7 @@
 import numpy as np
 
 def get_demo_image():
-    from matplotlib._cbook import get_sample_data
+    from matplotlib.utils import get_sample_data
     import numpy as np
     f = get_sample_data("axes_grid/bivariate_normal.npy", asfileobj=False)
     z = np.load(f)
diff --git a/examples/axes_grid/simple_axesgrid2.py b/examples/axes_grid/simple_axesgrid2.py
@@ -3,7 +3,7 @@
 
 def get_demo_image():
     import numpy as np
-    from matplotlib._cbook import get_sample_data
+    from matplotlib.utils import get_sample_data
     f = get_sample_data("axes_grid/bivariate_normal.npy", asfileobj=False)
     z = np.load(f)
     # z is a numpy array of 15x15
diff --git a/examples/misc/developer_commit_history.py b/examples/misc/developer_commit_history.py
@@ -10,9 +10,9 @@
 """
 import os, datetime
 
-import matplotlib._cbook as _cbook
+import matplotlib.utils as utils
 
-todate = _cbook.todate('%Y-%m-%d')
+todate = utils.todate('%Y-%m-%d')
 today = datetime.date.today()
 if not os.path.exists('log.txt'):
     print('You must place the "svn log" output into a file "log.txt"')
diff --git a/examples/misc/rc_traits.py b/examples/misc/rc_traits.py
@@ -7,7 +7,7 @@
 
 import sys, os, re
 import traits.api as traits
-from matplotlib._cbook import is_string_like
+from matplotlib.utils import is_string_like
 from matplotlib.artist import Artist
 
 doprint = True
diff --git a/examples/misc/rec_groupby_demo.py b/examples/misc/rec_groupby_demo.py
@@ -1,9 +1,9 @@
 from __future__ import print_function
 import numpy as np
 import matplotlib.mlab as mlab
-import matplotlib._cbook as _cbook
+import matplotlib.utils as utils
 
-datafile = _cbook.get_sample_data('aapl.csv', asfileobj=False)
+datafile = utils.get_sample_data('aapl.csv', asfileobj=False)
 print('loading', datafile)
 r = mlab.csv2rec(datafile)
 r.sort()
diff --git a/examples/misc/rec_join_demo.py b/examples/misc/rec_join_demo.py
@@ -1,9 +1,9 @@
 from __future__ import print_function
 import numpy as np
 import matplotlib.mlab as mlab
-import matplotlib._cbook as _cbook
+import matplotlib.utils as utils
 
-datafile = _cbook.get_sample_data('aapl.csv', asfileobj=False)
+datafile = utils.get_sample_data('aapl.csv', asfileobj=False)
 print('loading', datafile)
 r = mlab.csv2rec(datafile)
 
diff --git a/examples/misc/sample_data_demo.py b/examples/misc/sample_data_demo.py
@@ -3,7 +3,7 @@
 fetch it from github and cache it
 """
 from __future__ import print_function
-import matplotlib._cbook as _cbook
+import matplotlib.utils as utils
 import matplotlib.pyplot as plt
 fname = cbook.get_sample_data('ada.png', asfileobj=False)
 
diff --git a/examples/pylab_examples/centered_ticklabels.py b/examples/pylab_examples/centered_ticklabels.py
@@ -15,13 +15,13 @@
 import datetime
 import numpy as np
 import matplotlib
-import matplotlib._cbook as _cbook
+import matplotlib.utils as utils
 import matplotlib.dates as dates
 import matplotlib.ticker as ticker
 import matplotlib.pyplot as plt
 
 # load some financial data; apple's stock price
-fh = _cbook.get_sample_data('aapl.npy.gz')
+fh = utils.get_sample_data('aapl.npy.gz')
 r = np.load(fh); fh.close()
 r = r[-250:]  # get the last 250 days
 
diff --git a/examples/pylab_examples/data_helper.py b/examples/pylab_examples/data_helper.py
@@ -2,7 +2,9 @@
 # Some functions to load a return data for the plot demos
 
 from numpy import fromstring, argsort, take, array, resize
-import matplotlib._cbook as _cbook
+import matplotlib.utils as utils
+
+
 def get_two_stock_data():
     """
     load stock time and price data for two stocks The return values
@@ -11,8 +13,8 @@ def get_two_stock_data():
     """
     ticker1, ticker2 = 'INTC', 'AAPL'
 
-    file1 = _cbook.get_sample_data('INTC.dat.gz')
-    file2 = _cbook.get_sample_data('AAPL.dat.gz')
+    file1 = utils.get_sample_data('INTC.dat.gz')
+    file2 = utils.get_sample_data('AAPL.dat.gz')
     M1 = fromstring( file1.read(), '<d')
 
     M1 = resize(M1, (M1.shape[0]/2,2) )
@@ -39,7 +41,7 @@ class C: pass
     def get_ticker(ticker):
         vals = []
 
-        datafile = _cbook.get_sample_data('%s.csv'%ticker, asfileobj=False)
+        datafile = utils.get_sample_data('%s.csv'%ticker, asfileobj=False)
 
         lines = open(datafile).readlines()
         for line in lines[1:]:
diff --git a/examples/pylab_examples/date_index_formatter.py b/examples/pylab_examples/date_index_formatter.py
@@ -12,10 +12,10 @@
 import numpy
 from matplotlib.mlab import csv2rec
 from pylab import figure, show
-import matplotlib._cbook as _cbook
+import matplotlib.utils as utils 
 from matplotlib.ticker import Formatter
 
-datafile = _cbook.get_sample_data('msft.csv', asfileobj=False)
+datafile = utils.get_sample_data('msft.csv', asfileobj=False)
 print ('loading %s' % datafile)
 r = csv2rec(datafile)[-40:]
 
diff --git a/examples/pylab_examples/demo_annotation_box.py b/examples/pylab_examples/demo_annotation_box.py
@@ -1,7 +1,7 @@
 import matplotlib.pyplot as plt
 from matplotlib.offsetbox import TextArea, DrawingArea, OffsetImage, \
      AnnotationBbox
-from matplotlib._cbook import get_sample_data
+from matplotlib.utils import get_sample_data
 
 import numpy as np
 
diff --git a/examples/pylab_examples/demo_ribbon_box.py b/examples/pylab_examples/demo_ribbon_box.py
@@ -4,7 +4,7 @@
 
 from matplotlib._png import read_png
 import matplotlib.colors
-from matplotlib._cbook import get_sample_data
+from matplotlib.utils import get_sample_data
 
 class RibbonBox(object):
 
diff --git a/examples/pylab_examples/demo_text_path.py b/examples/pylab_examples/demo_text_path.py
@@ -11,7 +11,7 @@
 from matplotlib.offsetbox import AnnotationBbox,\
      AnchoredOffsetbox, AuxTransformBox
 
-from matplotlib._cbook import get_sample_data
+from matplotlib.utils import get_sample_data
 
 from matplotlib.text import TextPath
 
diff --git a/examples/pylab_examples/image_demo2.py b/examples/pylab_examples/image_demo2.py
@@ -2,11 +2,11 @@
 
 from __future__ import print_function
 from pylab import *
-import matplotlib._cbook as _cbook
+import matplotlib.utils as utils
 
 w, h = 512, 512
 
-datafile = _cbook.get_sample_data('ct.raw.gz', asfileobj=True)
+datafile = utils.get_sample_data('ct.raw.gz', asfileobj=True)
 s = datafile.read()
 A = fromstring(s, uint16).astype(float)
 A *= 1.0/max(A)
diff --git a/examples/pylab_examples/image_demo3.py b/examples/pylab_examples/image_demo3.py
@@ -5,7 +5,7 @@
 except ImportError:
     raise SystemExit("PIL must be installed to run this example")
 
-import matplotlib._cbook as _cbook
+import matplotlib.utils as utils
 
 datafile = cbook.get_sample_data('grace_hopper.jpg')
 lena = Image.open(datafile)
diff --git a/examples/pylab_examples/load_converter.py b/examples/pylab_examples/load_converter.py
@@ -3,9 +3,9 @@
 #from matplotlib.mlab import load
 import numpy as np
 from pylab import figure, show
-import matplotlib._cbook as _cbook
+import matplotlib.utils as utils
 
-datafile = _cbook.get_sample_data('msft.csv', asfileobj=False)
+datafile = utils.get_sample_data('msft.csv', asfileobj=False)
 print('loading', datafile)
 
 dates, closes = np.loadtxt(
diff --git a/examples/pylab_examples/loadrec.py b/examples/pylab_examples/loadrec.py
@@ -1,9 +1,9 @@
 from __future__ import print_function
 from matplotlib import mlab
 from pylab import figure, show
-import matplotlib._cbook as _cbook
+import matplotlib.utils as utils
 
-datafile = _cbook.get_sample_data('msft.csv', asfileobj=False)
+datafile = utils.get_sample_data('msft.csv', asfileobj=False)
 print('loading', datafile)
 a = mlab.csv2rec(datafile)
 a.sort()
diff --git a/examples/pylab_examples/logo.py b/examples/pylab_examples/logo.py
@@ -3,10 +3,10 @@
 
 from __future__ import print_function
 from pylab import *
-import matplotlib._cbook as _cbook
+import matplotlib.utils as utils
 
 # convert data to mV
-datafile = _cbook.get_sample_data('membrane.dat', asfileobj=False)
+datafile = utils.get_sample_data('membrane.dat', asfileobj=False)
 print('loading', datafile)
 
 x = 1000*0.1*fromstring(file(datafile, 'rb').read(), float32)
diff --git a/examples/pylab_examples/mri_demo.py b/examples/pylab_examples/mri_demo.py
@@ -2,9 +2,10 @@
 
 from __future__ import print_function
 from pylab import *
-import matplotlib._cbook as _cbook
+import matplotlib.utils as utils
+
 # data are 256x256 16 bit integers
-dfile = _cbook.get_sample_data('s1045.ima.gz')
+dfile = utils.get_sample_data('s1045.ima.gz')
 im = np.fromstring(dfile.read(), np.uint16).astype(float)
 im.shape = 256, 256
 
diff --git a/examples/pylab_examples/mri_with_eeg.py b/examples/pylab_examples/mri_with_eeg.py
@@ -10,12 +10,14 @@
 
 from matplotlib.pyplot import *
 from matplotlib.collections import LineCollection
-import matplotlib._cbook as _cbook
+import matplotlib.utils as utils
+
+
 # I use if 1 to break up the different regions of code visually
 
 if 1:   # load the data
     # data are 256x256 16 bit integers
-    dfile = _cbook.get_sample_data('s1045.ima.gz')
+    dfile = utils.get_sample_data('s1045.ima.gz')
     im = np.fromstring(dfile.read(), np.uint16).astype(float)
     im.shape = 256, 256
 
@@ -39,7 +41,7 @@
     # load the data
 
     numSamples, numRows = 800,4
-    eegfile = _cbook.get_sample_data('eeg.dat', asfileobj=False)
+    eegfile = utils.get_sample_data('eeg.dat', asfileobj=False)
     print ('loading eeg %s' % eegfile)
     data = np.fromstring(open(eegfile, 'rb').read(), float)
     data.shape = numSamples, numRows
diff --git a/examples/pylab_examples/plotfile_demo.py b/examples/pylab_examples/plotfile_demo.py
@@ -1,8 +1,8 @@
 from pylab import plotfile, show, gca
-import matplotlib._cbook as _cbook
+import matplotlib.utils as utils
 
-fname = _cbook.get_sample_data('msft.csv', asfileobj=False)
-fname2 = _cbook.get_sample_data('data_x_x2_x3.csv', asfileobj=False)
+fname = utils.get_sample_data('msft.csv', asfileobj=False)
+fname2 = utils.get_sample_data('data_x_x2_x3.csv', asfileobj=False)
 
 # test 1; use ints
 plotfile(fname, (0,5,6))
diff --git a/examples/pylab_examples/scatter_demo2.py b/examples/pylab_examples/scatter_demo2.py
diff --git a/examples/pylab_examples/webapp_demo.py b/examples/pylab_examples/webapp_demo.py
diff --git a/examples/tests/backend_driver.py b/examples/tests/backend_driver.py
diff --git a/examples/units/basic_units.py b/examples/units/basic_units.py
diff --git a/examples/units/evans_test.py b/examples/units/evans_test.py
diff --git a/examples/user_interfaces/embedding_in_wx3.py b/examples/user_interfaces/embedding_in_wx3.py
diff --git a/examples/user_interfaces/rec_edit_gtk_custom.py b/examples/user_interfaces/rec_edit_gtk_custom.py
diff --git a/examples/user_interfaces/rec_edit_gtk_simple.py b/examples/user_interfaces/rec_edit_gtk_simple.py
