removed a couple of cases of mlab.load

jdh2358 · jdh2358 · commit 520f85aec3dd · 2009-08-03T19:31:05.000Z
svn path=/branches/v0_99_maint/; revision=7337
diff --git a/doc/_templates/indexsidebar.html b/doc/_templates/indexsidebar.html
@@ -3,17 +3,12 @@ <h3>News</h3>
 <p>Please <a href="http://sourceforge.net/project/project_donations.php?group_id=80706">donate</a>
 to support matplotlib development.</p>
 
-<p>Watch a <a href="http://videolectures.net/mloss08_hunter_mat">video lecture</a> about matplotlib presented at <a href="http://videolectures.net/mloss08_whistler">NIPS 08 Workshop</a> <i>Machine Learning Open Source Software</i></a>. 
+<p>A release candidate rc1 of matplotlib-0.99.0 is <a href="http://drop.io/xortel1#">available</a> for testing.  Please post any bugs to the <a href="http://sourceforge.net/tracker2/?group_id=80706">tracker</a>
 </p>
 
-<p>Nominate matplotlib for a community choice award by clicking the
-image below -- suggested category "Best Project for Academia" for
-software which "helps you hit the books, analyze global trends, or
-just understand the world a little bit better than you did before":
-<a href="http://sourceforge.net/community/cca09/nominate/?project_name=matplotlib&project_url=http://sourceforge.net/projects/matplotlib/"><img src="http://sourceforge.net/images/cca/cca_nominate.png" border="0"/></a>
+<p>Watch a <a href="http://videolectures.net/mloss08_hunter_mat">video lecture</a> about matplotlib presented at <a href="http://videolectures.net/mloss08_whistler">NIPS 08 Workshop</a> <i>Machine Learning Open Source Software</i></a>. 
 </p>
 
-
 <h3>Download</h3>
 <p>Current version: <b>{{ version }}</b></p>
 
diff --git a/doc/api/spine_api.rst b/doc/api/spine_api.rst
@@ -4,7 +4,7 @@ matplotlib spine
 
 
 :mod:`matplotlib.spine`
-======================
+========================
 
 .. automodule:: matplotlib.spine
    :members:
diff --git a/doc/pyplots/plotmap.py b/doc/pyplots/plotmap.py
@@ -5,7 +5,9 @@
 # the data is interpolated to the native projection grid.
 import os
 from mpl_toolkits.basemap import Basemap, shiftgrid
-from pylab import title, colorbar, show, axes, cm, load, arange, figure, \
+import numpy as np
+
+from pylab import title, colorbar, show, axes, cm, arange, figure, \
                   text
 
 # read in topo data (on a regular lat/lon grid)
@@ -15,9 +17,9 @@
 if not os.path.exists(datadir):
     raise SystemExit('You need to download the data with svn co https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/trunk/htdocs/screenshots/data/" and set the datadir variable in %s'%__file__)
 
-topoin = load(os.path.join(datadir, 'etopo20data.gz'))
-lons = load(os.path.join(datadir, 'etopo20lons.gz'))
-lats = load(os.path.join(datadir, 'etopo20lats.gz'))
+topoin = np.loadtxt(os.path.join(datadir, 'etopo20data.gz'))
+lons = np.loadtxt(os.path.join(datadir, 'etopo20lons.gz'))
+lats = np.loadtxt(os.path.join(datadir, 'etopo20lats.gz'))
 # shift data so lons go from -180 to 180 instead of 20 to 380.
 topoin,lons = shiftgrid(180.,topoin,lons,start=False)
 
diff --git a/examples/pylab_examples/load_converter.py b/examples/pylab_examples/load_converter.py
@@ -1,8 +1,9 @@
 from matplotlib.dates import strpdate2num
-from matplotlib.mlab import load
+#from matplotlib.mlab import load
+import numpy as np
 from pylab import figure, show
 
-dates, closes = load(
+dates, closes = np.loadtxt(
     '../data/msft.csv', delimiter=',',
     converters={0:strpdate2num('%d-%b-%y')},
     skiprows=1, usecols=(0,2), unpack=True)
