Merge pull request #1 from matplotlib/master

merge changes from master

Author: Jeff Whitaker

lib/mpl_toolkits/basemap/__init__.py

@@ -3344,6 +3344,10 @@ def pcolor(self,x,y,data,**kwargs):
 
         Other \**kwargs passed on to matplotlib.pyplot.pcolor (or tricolor if
         ``tri=True``).
+        
+        Note: (taken from matplotlib.pyplot.pcolor documentation)
+        Ideally the dimensions of x and y should be one greater than those of data; 
+        if the dimensions are the same, then the last row and column of data will be ignored.
         """
         ax, plt = self._ax_plt_from_kw(kwargs)
         # allow callers to override the hold state by passing hold=True|False
@@ -3404,7 +3408,7 @@ def pcolormesh(self,x,y,data,**kwargs):
         """
         Make a pseudo-color plot over the map
         (see matplotlib.pyplot.pcolormesh documentation).
-
+               
         If ``latlon`` keyword is set to True, x,y are intrepreted as
         longitude and latitude in degrees.  Data and longitudes are
         automatically shifted to match map projection region for cylindrical
@@ -3415,6 +3419,10 @@ def pcolormesh(self,x,y,data,**kwargs):
         Extra keyword ``ax`` can be used to override the default axis instance.
 
         Other \**kwargs passed on to matplotlib.pyplot.pcolormesh.
+        
+        Note: (taken from matplotlib.pyplot.pcolor documentation)
+        Ideally the dimensions of x and y should be one greater than those of data; 
+        if the dimensions are the same, then the last row and column of data will be ignored.
         """
         ax, plt = self._ax_plt_from_kw(kwargs)
         # allow callers to override the hold state by passing hold=True|False

lib/mpl_toolkits/basemap/pyproj.py

@@ -235,7 +235,11 @@
 "sphere":       {'a':6370997.0,'b':6370997.0,'description':"Normal Sphere"},
 }
 
-pyproj_datadir = os.sep.join([os.path.dirname(__file__), 'data'])
+if 'BASEMAPDATA' in os.environ:
+    pyproj_datadir = os.environ['BASEMAPDATA']
+else:
+    pyproj_datadir = os.sep.join([os.path.dirname(__file__), 'data'])
+
 if not os.path.isdir(pyproj_datadir):
     msg="proj data directory not found. Expecting it at: %s"%pyproj_datadir
     raise IOError(msg)