SF.net SVN: matplotlib: [4118] trunk/toolkits/basemap-testing/lib/ matplotlib/toolkits/basemap/basemap.py

[<js...@us...>]

Revision: 4118
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4118&view=rev
Author:   jswhit
Date:     2007-11-05 13:07:32 -0800 (Mon, 05 Nov 2007)

Log Message:
-----------
remove last vestiges of numerix

Modified Paths:
--------------
    trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/basemap.py

Modified: trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/basemap.py
===================================================================
--- trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/basemap.py	2007-11-05 21:02:33 UTC (rev 4117)
+++ trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/basemap.py	2007-11-05 21:07:32 UTC (rev 4118)
@@ -10,10 +10,8 @@
 from matplotlib.lines import Line2D
 import pyproj, sys, os, math, dbflib
 from proj import Proj
-from matplotlib.numerix import ma
 import numpy as npy
-from numpy import linspace
-from matplotlib.numerix.mlab import squeeze
+from numpy import linspace, squeeze, ma
 from matplotlib.cbook import popd, is_scalar
 from shapelib import ShapeFile
 from shapely.geometry import Polygon as PolygonShape
@@ -2572,7 +2570,7 @@
  points in datain are masked.  To avoid this, do the interpolation in two
  passes, first with order=1 (producing dataout1), then with order=0
  (producing dataout2).  Then replace all the masked values in dataout1
- with the corresponding elements in dataout2 (using numerix.where).
+ with the corresponding elements in dataout2 (using numpy.where).
  This effectively uses nearest neighbor interpolation if any of the
  four surrounding points in datain are masked, and bilinear interpolation
  otherwise.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.