From: <js...@us...> - 2008-01-10 13:21:57
|
Revision: 4839 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4839&view=rev Author: jswhit Date: 2008-01-10 05:21:55 -0800 (Thu, 10 Jan 2008) Log Message: ----------- change import to 'from mpl_toolkits.basemap import Basemap' Modified Paths: -------------- trunk/toolkits/basemap/examples/ccsm_popgrid.py trunk/toolkits/basemap/examples/contour_demo.py trunk/toolkits/basemap/examples/customticks.py trunk/toolkits/basemap/examples/fcstmaps.py trunk/toolkits/basemap/examples/fillstates.py trunk/toolkits/basemap/examples/garp.py trunk/toolkits/basemap/examples/geos_demo.py trunk/toolkits/basemap/examples/geos_demo_2.py trunk/toolkits/basemap/examples/hires.py trunk/toolkits/basemap/examples/hurrtracks.py trunk/toolkits/basemap/examples/nytolondon.py trunk/toolkits/basemap/examples/ortho_demo.py trunk/toolkits/basemap/examples/panelplot.py trunk/toolkits/basemap/examples/plot_tissot.py trunk/toolkits/basemap/examples/plotcities.py trunk/toolkits/basemap/examples/plotmap.py trunk/toolkits/basemap/examples/plotmap_masked.py trunk/toolkits/basemap/examples/plotmap_oo.py trunk/toolkits/basemap/examples/plotprecip.py trunk/toolkits/basemap/examples/plotsst.py trunk/toolkits/basemap/examples/pnganim.py trunk/toolkits/basemap/examples/polarmaps.py trunk/toolkits/basemap/examples/quiver_demo.py trunk/toolkits/basemap/examples/randompoints.py trunk/toolkits/basemap/examples/setwh.py trunk/toolkits/basemap/examples/show_colormaps.py trunk/toolkits/basemap/examples/simpletest.py trunk/toolkits/basemap/examples/simpletest_oo.py trunk/toolkits/basemap/examples/test.py trunk/toolkits/basemap/examples/testgdal.py trunk/toolkits/basemap/examples/warpimage.py trunk/toolkits/basemap/examples/wiki_example.py Modified: trunk/toolkits/basemap/examples/ccsm_popgrid.py =================================================================== --- trunk/toolkits/basemap/examples/ccsm_popgrid.py 2008-01-10 13:15:37 UTC (rev 4838) +++ trunk/toolkits/basemap/examples/ccsm_popgrid.py 2008-01-10 13:21:55 UTC (rev 4839) @@ -24,7 +24,7 @@ from matplotlib import rcParams from numpy import ma as MA import numpy as N -from matplotlib.toolkits.basemap import Basemap, NetCDFFile +from mpl_toolkits.basemap import Basemap, NetCDFFile # read in data from netCDF file. infile = 'ccsm_popgrid.nc' Modified: trunk/toolkits/basemap/examples/contour_demo.py =================================================================== --- trunk/toolkits/basemap/examples/contour_demo.py 2008-01-10 13:15:37 UTC (rev 4838) +++ trunk/toolkits/basemap/examples/contour_demo.py 2008-01-10 13:21:55 UTC (rev 4839) @@ -1,4 +1,4 @@ -from matplotlib.toolkits.basemap import Basemap, shiftgrid +from mpl_toolkits.basemap import Basemap, shiftgrid from pylab import load, show, colorbar, axes, gca,\ figure, title, meshgrid, cm, arange Modified: trunk/toolkits/basemap/examples/customticks.py =================================================================== --- trunk/toolkits/basemap/examples/customticks.py 2008-01-10 13:15:37 UTC (rev 4838) +++ trunk/toolkits/basemap/examples/customticks.py 2008-01-10 13:21:55 UTC (rev 4839) @@ -1,4 +1,4 @@ -from matplotlib.toolkits.basemap import Basemap +from mpl_toolkits.basemap import Basemap import pylab, numpy from matplotlib.ticker import FuncFormatter Modified: trunk/toolkits/basemap/examples/fcstmaps.py =================================================================== --- trunk/toolkits/basemap/examples/fcstmaps.py 2008-01-10 13:15:37 UTC (rev 4838) +++ trunk/toolkits/basemap/examples/fcstmaps.py 2008-01-10 13:21:55 UTC (rev 4839) @@ -6,7 +6,7 @@ import sys from numpy import ma import datetime -from matplotlib.toolkits.basemap import Basemap, NetCDFFile, addcyclic, num2date +from mpl_toolkits.basemap import Basemap, NetCDFFile, addcyclic, num2date # today's date is default. Modified: trunk/toolkits/basemap/examples/fillstates.py =================================================================== --- trunk/toolkits/basemap/examples/fillstates.py 2008-01-10 13:15:37 UTC (rev 4838) +++ trunk/toolkits/basemap/examples/fillstates.py 2008-01-10 13:21:55 UTC (rev 4839) @@ -1,6 +1,6 @@ import pylab as p import numpy -from matplotlib.toolkits.basemap import Basemap as Basemap +from mpl_toolkits.basemap import Basemap as Basemap from matplotlib.colors import rgb2hex from matplotlib.patches import Polygon Modified: trunk/toolkits/basemap/examples/garp.py =================================================================== --- trunk/toolkits/basemap/examples/garp.py 2008-01-10 13:15:37 UTC (rev 4838) +++ trunk/toolkits/basemap/examples/garp.py 2008-01-10 13:21:55 UTC (rev 4839) @@ -1,4 +1,4 @@ -from matplotlib.toolkits.basemap import Basemap +from mpl_toolkits.basemap import Basemap from pylab import title, show, arange, pi # the shortest route from the center of the map Modified: trunk/toolkits/basemap/examples/geos_demo.py =================================================================== --- trunk/toolkits/basemap/examples/geos_demo.py 2008-01-10 13:15:37 UTC (rev 4838) +++ trunk/toolkits/basemap/examples/geos_demo.py 2008-01-10 13:21:55 UTC (rev 4839) @@ -1,4 +1,4 @@ -from matplotlib.toolkits.basemap import Basemap +from mpl_toolkits.basemap import Basemap from pylab import title, show, arange, figure # create Basemap instance for Geostationary (satellite view) projection. Modified: trunk/toolkits/basemap/examples/geos_demo_2.py =================================================================== --- trunk/toolkits/basemap/examples/geos_demo_2.py 2008-01-10 13:15:37 UTC (rev 4838) +++ trunk/toolkits/basemap/examples/geos_demo_2.py 2008-01-10 13:21:55 UTC (rev 4839) @@ -9,7 +9,7 @@ """ from PIL import Image -from matplotlib.toolkits.basemap import Basemap +from mpl_toolkits.basemap import Basemap from pylab import figure, cm, arange, colorbar, text, savefig, gcf, clim, title, show from matplotlib.image import pil_to_array Modified: trunk/toolkits/basemap/examples/hires.py =================================================================== --- trunk/toolkits/basemap/examples/hires.py 2008-01-10 13:15:37 UTC (rev 4838) +++ trunk/toolkits/basemap/examples/hires.py 2008-01-10 13:21:55 UTC (rev 4839) @@ -1,4 +1,4 @@ -from matplotlib.toolkits.basemap import Basemap +from mpl_toolkits.basemap import Basemap from pylab import show, title, arange, figure, clf import cPickle, time Modified: trunk/toolkits/basemap/examples/hurrtracks.py =================================================================== --- trunk/toolkits/basemap/examples/hurrtracks.py 2008-01-10 13:15:37 UTC (rev 4838) +++ trunk/toolkits/basemap/examples/hurrtracks.py 2008-01-10 13:21:55 UTC (rev 4839) @@ -4,7 +4,7 @@ ESRI shapefile data from http://www.nationalatlas.gov/atlasftp.html """ import pylab as p -from matplotlib.toolkits.basemap import Basemap as Basemap +from mpl_toolkits.basemap import Basemap as Basemap # Lambert Conformal Conic map. m = Basemap(llcrnrlon=-100.,llcrnrlat=0.,urcrnrlon=-20.,urcrnrlat=57., projection='lcc',lat_1=20.,lat_2=40.,lon_0=-60., Modified: trunk/toolkits/basemap/examples/nytolondon.py =================================================================== --- trunk/toolkits/basemap/examples/nytolondon.py 2008-01-10 13:15:37 UTC (rev 4838) +++ trunk/toolkits/basemap/examples/nytolondon.py 2008-01-10 13:21:55 UTC (rev 4839) @@ -1,5 +1,5 @@ # example demonstrating how to draw a great circle on a map. -from matplotlib.toolkits.basemap import Basemap +from mpl_toolkits.basemap import Basemap from pylab import title, arange, show, figure # setup lambert azimuthal map projection. Modified: trunk/toolkits/basemap/examples/ortho_demo.py =================================================================== --- trunk/toolkits/basemap/examples/ortho_demo.py 2008-01-10 13:15:37 UTC (rev 4838) +++ trunk/toolkits/basemap/examples/ortho_demo.py 2008-01-10 13:21:55 UTC (rev 4839) @@ -1,4 +1,4 @@ -from matplotlib.toolkits.basemap import Basemap +from mpl_toolkits.basemap import Basemap from pylab import title, show, arange, figure # create Basemap instance for Orthographic (satellite view) projection. Modified: trunk/toolkits/basemap/examples/panelplot.py =================================================================== --- trunk/toolkits/basemap/examples/panelplot.py 2008-01-10 13:15:37 UTC (rev 4838) +++ trunk/toolkits/basemap/examples/panelplot.py 2008-01-10 13:21:55 UTC (rev 4839) @@ -1,4 +1,4 @@ -from matplotlib.toolkits.basemap import Basemap +from mpl_toolkits.basemap import Basemap from matplotlib import rcParams from matplotlib.ticker import MultipleLocator import pylab as P Modified: trunk/toolkits/basemap/examples/plot_tissot.py =================================================================== --- trunk/toolkits/basemap/examples/plot_tissot.py 2008-01-10 13:15:37 UTC (rev 4838) +++ trunk/toolkits/basemap/examples/plot_tissot.py 2008-01-10 13:21:55 UTC (rev 4839) @@ -1,5 +1,5 @@ import pylab as p -from matplotlib.toolkits.basemap import Basemap as Basemap +from mpl_toolkits.basemap import Basemap as Basemap from matplotlib.patches import Polygon # Tissot's Indicatrix (http://en.wikipedia.org/wiki/Tissot's_Indicatrix). Modified: trunk/toolkits/basemap/examples/plotcities.py =================================================================== --- trunk/toolkits/basemap/examples/plotcities.py 2008-01-10 13:15:37 UTC (rev 4838) +++ trunk/toolkits/basemap/examples/plotcities.py 2008-01-10 13:21:55 UTC (rev 4839) @@ -1,7 +1,7 @@ import pylab as p from matplotlib.mlab import prctile_rank import numpy -from matplotlib.toolkits.basemap import Basemap as Basemap +from mpl_toolkits.basemap import Basemap as Basemap # cities colored by population rank. Modified: trunk/toolkits/basemap/examples/plotmap.py =================================================================== --- trunk/toolkits/basemap/examples/plotmap.py 2008-01-10 13:15:37 UTC (rev 4838) +++ trunk/toolkits/basemap/examples/plotmap.py 2008-01-10 13:21:55 UTC (rev 4839) @@ -4,7 +4,7 @@ # the data is interpolated to the native projection grid. -from matplotlib.toolkits.basemap import Basemap, shiftgrid +from mpl_toolkits.basemap import Basemap, shiftgrid from pylab import title, colorbar, show, axes, cm, load, arange, figure, \ text Modified: trunk/toolkits/basemap/examples/plotmap_masked.py =================================================================== --- trunk/toolkits/basemap/examples/plotmap_masked.py 2008-01-10 13:15:37 UTC (rev 4838) +++ trunk/toolkits/basemap/examples/plotmap_masked.py 2008-01-10 13:21:55 UTC (rev 4839) @@ -5,7 +5,7 @@ # demonstrates use of masked arrays to mask out certain regions # (in this case the oceans) -from matplotlib.toolkits.basemap import Basemap, shiftgrid +from mpl_toolkits.basemap import Basemap, shiftgrid from pylab import title, colorbar, show, axes, cm, load, arange, figure, \ text, where from numpy import ma Modified: trunk/toolkits/basemap/examples/plotmap_oo.py =================================================================== --- trunk/toolkits/basemap/examples/plotmap_oo.py 2008-01-10 13:15:37 UTC (rev 4838) +++ trunk/toolkits/basemap/examples/plotmap_oo.py 2008-01-10 13:21:55 UTC (rev 4839) @@ -12,7 +12,7 @@ matplotlib.use('Agg') from matplotlib.backends.backend_agg import FigureCanvasAgg as FigureCanvas -from matplotlib.toolkits.basemap import Basemap, shiftgrid +from mpl_toolkits.basemap import Basemap, shiftgrid from matplotlib.figure import Figure import numpy import matplotlib.cm as cm Modified: trunk/toolkits/basemap/examples/plotprecip.py =================================================================== --- trunk/toolkits/basemap/examples/plotprecip.py 2008-01-10 13:15:37 UTC (rev 4838) +++ trunk/toolkits/basemap/examples/plotprecip.py 2008-01-10 13:21:55 UTC (rev 4839) @@ -1,4 +1,4 @@ -from matplotlib.toolkits.basemap import Basemap, cm, NetCDFFile +from mpl_toolkits.basemap import Basemap, cm, NetCDFFile import pylab, copy from matplotlib import rcParams Modified: trunk/toolkits/basemap/examples/plotsst.py =================================================================== --- trunk/toolkits/basemap/examples/plotsst.py 2008-01-10 13:15:37 UTC (rev 4838) +++ trunk/toolkits/basemap/examples/plotsst.py 2008-01-10 13:21:55 UTC (rev 4839) @@ -1,4 +1,4 @@ -from matplotlib.toolkits.basemap import Basemap, NetCDFFile +from mpl_toolkits.basemap import Basemap, NetCDFFile import pylab, numpy, sys # read in sea-surface temperature and ice data # can be a local file, a URL for a remote opendap dataset, Modified: trunk/toolkits/basemap/examples/pnganim.py =================================================================== --- trunk/toolkits/basemap/examples/pnganim.py 2008-01-10 13:15:37 UTC (rev 4838) +++ trunk/toolkits/basemap/examples/pnganim.py 2008-01-10 13:21:55 UTC (rev 4839) @@ -8,7 +8,7 @@ import pylab from numpy import ma import datetime, sys, time, subprocess -from matplotlib.toolkits.basemap import Basemap, shiftgrid, NetCDFFile, num2date +from mpl_toolkits.basemap import Basemap, shiftgrid, NetCDFFile, num2date # times for March 1993 'storm of the century' YYYYMMDDHH1 = '1993031000' Modified: trunk/toolkits/basemap/examples/polarmaps.py =================================================================== --- trunk/toolkits/basemap/examples/polarmaps.py 2008-01-10 13:15:37 UTC (rev 4838) +++ trunk/toolkits/basemap/examples/polarmaps.py 2008-01-10 13:21:55 UTC (rev 4839) @@ -5,7 +5,7 @@ # illustrates special-case polar-centric projections. -from matplotlib.toolkits.basemap import Basemap +from mpl_toolkits.basemap import Basemap from pylab import title, colorbar, show, axes, cm, load, arange, \ figure, ravel, meshgrid Modified: trunk/toolkits/basemap/examples/quiver_demo.py =================================================================== --- trunk/toolkits/basemap/examples/quiver_demo.py 2008-01-10 13:15:37 UTC (rev 4838) +++ trunk/toolkits/basemap/examples/quiver_demo.py 2008-01-10 13:21:55 UTC (rev 4839) @@ -1,4 +1,4 @@ -from matplotlib.toolkits.basemap import Basemap +from mpl_toolkits.basemap import Basemap import numpy from pylab import show, title, arange, meshgrid, cm, figure, \ colorbar, axes, gca, reshape, quiverkey Modified: trunk/toolkits/basemap/examples/randompoints.py =================================================================== --- trunk/toolkits/basemap/examples/randompoints.py 2008-01-10 13:15:37 UTC (rev 4838) +++ trunk/toolkits/basemap/examples/randompoints.py 2008-01-10 13:21:55 UTC (rev 4839) @@ -1,6 +1,6 @@ from pylab import show, title, arange, figure, title, arccos, pi, cm, text from matplotlib.colors import rgb2hex -from matplotlib.toolkits.basemap import Basemap +from mpl_toolkits.basemap import Basemap from numpy.random import uniform # Plot a bunch of randomly distributed points on the earth. Modified: trunk/toolkits/basemap/examples/setwh.py =================================================================== --- trunk/toolkits/basemap/examples/setwh.py 2008-01-10 13:15:37 UTC (rev 4838) +++ trunk/toolkits/basemap/examples/setwh.py 2008-01-10 13:21:55 UTC (rev 4839) @@ -1,7 +1,7 @@ # examples of using the 'width' and 'height' keywords # to the Basemap constructor. -from matplotlib.toolkits.basemap import Basemap +from mpl_toolkits.basemap import Basemap from pylab import arange, show, title, figure # setup projection parameters Modified: trunk/toolkits/basemap/examples/show_colormaps.py =================================================================== --- trunk/toolkits/basemap/examples/show_colormaps.py 2008-01-10 13:15:37 UTC (rev 4838) +++ trunk/toolkits/basemap/examples/show_colormaps.py 2008-01-10 13:21:55 UTC (rev 4839) @@ -1,5 +1,5 @@ import numpy, pylab -from matplotlib.toolkits.basemap import cm +from mpl_toolkits.basemap import cm a=numpy.outer(numpy.arange(0,1,0.01),numpy.ones(10)) pylab.figure(figsize=(10,7)) pylab.subplots_adjust(top=0.8,bottom=0.05,left=0.01,right=0.99) Modified: trunk/toolkits/basemap/examples/simpletest.py =================================================================== --- trunk/toolkits/basemap/examples/simpletest.py 2008-01-10 13:15:37 UTC (rev 4838) +++ trunk/toolkits/basemap/examples/simpletest.py 2008-01-10 13:21:55 UTC (rev 4839) @@ -1,4 +1,4 @@ -from matplotlib.toolkits.basemap import Basemap +from mpl_toolkits.basemap import Basemap from pylab import load, show, title, meshgrid, cm, arange # read in topo data (on a regular lat/lon grid) etopo=load('etopo20data.gz') Modified: trunk/toolkits/basemap/examples/simpletest_oo.py =================================================================== --- trunk/toolkits/basemap/examples/simpletest_oo.py 2008-01-10 13:15:37 UTC (rev 4838) +++ trunk/toolkits/basemap/examples/simpletest_oo.py 2008-01-10 13:21:55 UTC (rev 4839) @@ -5,7 +5,7 @@ import matplotlib matplotlib.use('Agg') from matplotlib.backends.backend_agg import FigureCanvasAgg as FigureCanvas -from matplotlib.toolkits.basemap import Basemap +from mpl_toolkits.basemap import Basemap from matplotlib.figure import Figure import numpy import matplotlib.cm as cm Modified: trunk/toolkits/basemap/examples/test.py =================================================================== --- trunk/toolkits/basemap/examples/test.py 2008-01-10 13:15:37 UTC (rev 4838) +++ trunk/toolkits/basemap/examples/test.py 2008-01-10 13:21:55 UTC (rev 4839) @@ -3,7 +3,7 @@ # country boundaries, filling continents and drawing # parallels/meridians -from matplotlib.toolkits.basemap import Basemap, shiftgrid +from mpl_toolkits.basemap import Basemap, shiftgrid from pylab import show,arange,draw,figure,load,ravel,cm,axes,\ colorbar,title,gca,pi,meshgrid import matplotlib.colors as colors Modified: trunk/toolkits/basemap/examples/testgdal.py =================================================================== --- trunk/toolkits/basemap/examples/testgdal.py 2008-01-10 13:15:37 UTC (rev 4838) +++ trunk/toolkits/basemap/examples/testgdal.py 2008-01-10 13:21:55 UTC (rev 4839) @@ -7,7 +7,7 @@ http://edcftp.cr.usgs.gov/pub/data/nationalatlas/countyp020.tar.gz """ import gdal -from matplotlib.toolkits.basemap import Basemap +from mpl_toolkits.basemap import Basemap from gdalconst import * import pylab as p Modified: trunk/toolkits/basemap/examples/warpimage.py =================================================================== --- trunk/toolkits/basemap/examples/warpimage.py 2008-01-10 13:15:37 UTC (rev 4838) +++ trunk/toolkits/basemap/examples/warpimage.py 2008-01-10 13:21:55 UTC (rev 4839) @@ -1,6 +1,6 @@ import pylab as P import numpy -from matplotlib.toolkits.basemap import Basemap +from mpl_toolkits.basemap import Basemap from numpy import ma from matplotlib.image import pil_to_array from PIL import Image Modified: trunk/toolkits/basemap/examples/wiki_example.py =================================================================== --- trunk/toolkits/basemap/examples/wiki_example.py 2008-01-10 13:15:37 UTC (rev 4838) +++ trunk/toolkits/basemap/examples/wiki_example.py 2008-01-10 13:21:55 UTC (rev 4839) @@ -1,4 +1,4 @@ -from matplotlib.toolkits.basemap import Basemap +from mpl_toolkits.basemap import Basemap import pylab as p # set up orthographic map projection with # perspective of satellite looking down at 50N, 100W. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |