Merge branch 'issue498' of git://github.com/mdboom/matplotlib into mdboom-issue498

Conflicts:
	lib/matplotlib/cbook.py

Author: efiring

MANIFEST.in

@@ -13,6 +13,7 @@ include lib/matplotlib/mpl-data/images/*
 include lib/matplotlib/mpl-data/fonts/ttf/*
 include lib/matplotlib/mpl-data/fonts/pdfcorefonts/*
 include lib/matplotlib/mpl-data/fonts/afm/*
+recursive-include lib/matplotlib/mpl-data/sample_data/*
 recursive-include license LICENSE*
 recursive-include examples *
 recursive-include doc *

examples/misc/sample_data_test.py

@@ -21,7 +21,7 @@
 import matplotlib.pyplot as plt
 
 # load some financial data; apple's stock price
-fh = cbook.get_sample_data('aapl.npy')
+fh = cbook.get_sample_data('aapl.npy.gz')
 r = np.load(fh); fh.close()
 r = r[-250:]  # get the last 250 days
 

examples/pylab_examples/centered_ticklabels.py

@@ -11,13 +11,13 @@ def get_two_stock_data():
     """
     ticker1, ticker2 = 'INTC', 'AAPL'
 
-    file1 = cbook.get_sample_data('INTC.dat', asfileobj=False)
-    file2 = cbook.get_sample_data('AAPL.dat', asfileobj=False)
-    M1 = fromstring( open(file1, 'rb').read(), '<d')
+    file1 = cbook.get_sample_data('INTC.dat.gz')
+    file2 = cbook.get_sample_data('AAPL.dat.gz')
+    M1 = fromstring( file1.read(), '<d')
 
     M1 = resize(M1, (M1.shape[0]/2,2) )
 
-    M2 = fromstring( open(file2, 'rb').read(), '<d')
+    M2 = fromstring( file2.read(), '<d')
     M2 = resize(M2, (M2.shape[0]/2,2) )
 
     d1, p1 = M1[:,0], M1[:,1]

examples/pylab_examples/data_helper.py

@@ -6,9 +6,8 @@
 
 w, h = 512, 512
 
-datafile = cbook.get_sample_data('ct.raw', asfileobj=False)
-print ('loading %s' % datafile)
-s = open(datafile, 'rb').read()
+datafile = cbook.get_sample_data('ct.raw.gz', asfileobj=True)
+s = datafile.read()
 A = fromstring(s, uint16).astype(float)
 A *= 1.0/max(A)
 A.shape = w, h
@@ -35,4 +34,3 @@
     setp(gca(), 'xticklabels', [])
 
 show()
-

examples/pylab_examples/image_demo2.py

@@ -4,9 +4,8 @@
 from pylab import *
 import matplotlib.cbook as cbook
 # data are 256x256 16 bit integers
-dfile = cbook.get_sample_data('s1045.ima', asfileobj=False)
-print ('loading image %s' % dfile)
-im = np.fromstring(open(dfile, 'rb').read(), np.uint16).astype(float)
+dfile = cbook.get_sample_data('s1045.ima')
+im = np.fromstring(dfile.read(), np.uint16).astype(float)
 im.shape = 256, 256
 
 #imshow(im, ColormapJet(256))

examples/pylab_examples/mri_demo.py

@@ -15,9 +15,8 @@
 
 if 1:   # load the data
     # data are 256x256 16 bit integers
-    dfile = cbook.get_sample_data('s1045.ima', asfileobj=False)
-    print ('loading image %s' % dfile)
-    im = np.fromstring(open(dfile, 'rb').read(), np.uint16).astype(float)
+    dfile = cbook.get_sample_data('s1045.ima.gz')
+    im = np.fromstring(dfile.read(), np.uint16).astype(float)
     im.shape = 256, 256
 
 if 1: # plot the MRI in pcolor

examples/pylab_examples/mri_with_eeg.py

@@ -813,20 +813,6 @@ def rc_params_from_file(fname, fail_on_error=False):
 # this is the instance used by the matplotlib classes
 rcParams = rc_params()
 
-if rcParams['examples.directory']:
-    # paths that are intended to be relative to matplotlib_fname()
-    # are allowed for the examples.directory parameter.
-    # However, we will need to fully qualify the path because
-    # Sphinx requires absolute paths.
-    if not os.path.isabs(rcParams['examples.directory']):
-        _basedir, _fname = os.path.split(matplotlib_fname())
-        # Sometimes matplotlib_fname() can return relative paths,
-        # Also, using realpath() guarentees that Sphinx will use
-        # the same path that matplotlib sees (in case of weird symlinks).
-        _basedir = os.path.realpath(_basedir)
-        _fullpath = os.path.join(_basedir, rcParams['examples.directory'])
-        rcParams['examples.directory'] = _fullpath
-
 rcParamsOrig = rcParams.copy()
 
 rcParamsDefault = RcParams([ (key, default) for key, (default, converter) in \