Revision: 8692
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8692&view=rev
Author: jswhit
Date: 2010-09-08 15:53:27 +0000 (Wed, 08 Sep 2010)
Log Message:
-----------
add DeprecationWarning in NetCDFFile
Modified Paths:
--------------
trunk/toolkits/basemap/Changelog
trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py
Modified: trunk/toolkits/basemap/Changelog
===================================================================
--- trunk/toolkits/basemap/Changelog 2010-09-08 15:51:18 UTC (rev 8691)
+++ trunk/toolkits/basemap/Changelog 2010-09-08 15:53:27 UTC (rev 8692)
@@ -1,4 +1,6 @@
version 1.0.1 (not yet released).
+ * NetCDFFile function deprecated, will be removed in 1.0.2. Issue
+ warning advising users to use netcdf4-python instead.
* Deleting an item from the dicts returned by drawparallels
and drawmeridians removes the corresponding parallel or meridian
(and
associated labels) from the plot.
Modified: trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py
===================================================================
--- trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py 2010-09-08
15:51:18 UTC (rev 8691)
+++ trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py 2010-09-08
15:53:27 UTC (rev 8692)
@@ -4,7 +4,9 @@
Contains the :class:`Basemap` class (which does most of the
heavy lifting), and the following functions:
-:func:`NetCDFFile`: Read local and remote NetCDF datasets.
+:func:`NetCDFFile`: Read local and remote NetCDF datasets. Deprecated
+as of version 1.0.1 (will be removed in 1.0.2). Use netcdf4-python
+(http://netcdf4-python.googlecode.com) module instead.
:func:`interp`: bilinear interpolation between rectilinear grids.
@@ -2015,9 +2017,11 @@
self.set_axes_limits(ax=ax)
keys = linecolls.keys(); vals = linecolls.values()
for k,v in zip(keys,vals):
- if v == ([], []): del linecolls[k]
+ if v == ([], []):
+ del linecolls[k]
# add a remove method to each tuple.
- linecolls[k] = _tup(linecolls[k])
+ else:
+ linecolls[k] = _tup(linecolls[k])
# override __delitem__ in dict to call remove() on values.
return _dict(linecolls)
@@ -2262,9 +2266,11 @@
# remove empty values from linecolls dictionary
keys = linecolls.keys(); vals = linecolls.values()
for k,v in zip(keys,vals):
- if v == ([], []): del linecolls[k]
+ if v == ([], []):
+ del linecolls[k]
+ else:
# add a remove method to each tuple.
- linecolls[k] = _tup(linecolls[k])
+ linecolls[k] = _tup(linecolls[k])
# override __delitem__ in dict to call remove() on values.
return _dict(linecolls)
@@ -3935,6 +3941,13 @@
This may be slow for very large netCDF variables.
"""
import netcdf
+ import warnings
+ msg=dedent("""
+
+ NetCDFFile will be removed in 1.0.2, please use netcdf4-python
+ (http://netcdf4-python.googlecode.com) instead
+ """)
+ warnings.warn(msg,DeprecationWarning)
if file.startswith('http'):
return netcdf._RemoteFile(file,maskandscale=maskandscale,\
cache=cache,username=username,password=password,verbose=verbose)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net Dev2Dev email is sponsored by:
Show off your parallel programming skills.
Enter the Intel(R) Threading Challenge 2010.
http://p.sf.net/sfu/intel-thread-sfd
_______________________________________________
Matplotlib-checkins mailing list
Matplotlib-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
