SF.net SVN: matplotlib:[8975] trunk/toolkits/basemap

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

Revision: 8975
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8975&view=rev
Author:   jswhit
Date:     2011-02-12 13:53:30 +0000 (Sat, 12 Feb 2011)

Log Message:
-----------
remove deprecated NetCDFFile

Modified Paths:
--------------
    trunk/toolkits/basemap/Changelog
    trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py
    trunk/toolkits/basemap/setup.py

Modified: trunk/toolkits/basemap/Changelog
===================================================================
--- trunk/toolkits/basemap/Changelog	2011-02-12 04:35:09 UTC (rev 8974)
+++ trunk/toolkits/basemap/Changelog	2011-02-12 13:53:30 UTC (rev 8975)
@@ -1,3 +1,7 @@
+version 1.0.2 (not yet released)
+           * added lic_demo.py to examples (line integral convolution,
+             requires scikit.vectorplot).
+           * removed deprecated NetCDFFile.
 version 1.0.1 (svn revision 8967)
            * regenerated C source with cython 0.14.1.
            * added new "allsky" example from Tom Loredo.

Modified: trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py
===================================================================
--- trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py	2011-02-12 04:35:09 UTC (rev 8974)
+++ trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py	2011-02-12 13:53:30 UTC (rev 8975)
@@ -4,10 +4,6 @@
 Contains the :class:`Basemap` class (which does most of the
 heavy lifting), and the following functions:
 
-: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.
 
 :func:`maskoceans`:  mask 'wet' points of an input array.
@@ -54,7 +50,7 @@
 else:
     basemap_datadir = os.sep.join([os.path.dirname(__file__), 'data'])
 
-__version__ = '1.0.1'
+__version__ = '1.0.2'
 
 # supported map projections.
 _projnames = {'cyl'      : 'Cylindrical Equidistant',
@@ -3978,52 +3974,6 @@
     else:
         return corners
 
-def NetCDFFile(file, mode='r', maskandscale=True, cache=None, mmap=True,\
-               username=None, password=None, verbose=False):
-    """NetCDF File reader/writer.  API is the same as Scientific.IO.NetCDF.
-
-    If ``file`` is a URL that starts with `http`, it is assumed
-    to be a remote OPenDAP dataset, and pydap is used
-    to retrieve the data. Only the OPenDAP Array and Grid data
-    types are recognized.  If file does not start with `http`, it
-    is assumed to be a local netCDF file and is read
-    with scipy.io.netcdf. Both pydap and scipy.io.netcdf are written
-    by Roberto De Almeida.
-
-    Data will
-    automatically be converted to and from masked arrays if the variable
-    has either a ``missing_value`` or ``_FillValue`` attribute, and
-    some data points are equal to the value specified by that attribute.
-    In addition, variables that have the ``scale_factor`` and ``add_offset``
-    attribute will automatically be converted to and from short integers.
-    To suppress these automatic conversions, set the ``maskandscale``
-    keyword to False.
-
-    The keywords ``cache``, ``username``, ``password`` and ``verbose`` are only
-    valid for remote OPenDAP datasets.  ``username`` and ``password`` are used
-    to access OPenDAP datasets that require authentication.  ``verbose=True``
-    will make the pydap client print out the URLs being accessed.
-    ``cache`` is a location (a directory) for caching data, so that repeated
-    accesses to the same URL avoid the network.
-
-    The keyword ``mmap`` is only valid for local netCDF files.  When
-    ``mmap=True`` (default), the mmap module is used to access the data.
-    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)
-    else:
-        return netcdf.netcdf_file(file,mode=mode,mmap=mmap,maskandscale=maskandscale)
-
 def num2date(times,units='days since 0001-01-01 00:00:00',calendar='proleptic_gregorian'):
     """
     Return datetime objects given numeric time values. The units

Modified: trunk/toolkits/basemap/setup.py
===================================================================
--- trunk/toolkits/basemap/setup.py	2011-02-12 04:35:09 UTC (rev 8974)
+++ trunk/toolkits/basemap/setup.py	2011-02-12 13:53:30 UTC (rev 8975)
@@ -241,7 +241,7 @@
 
 setup(
   name              = "basemap",
-  version           = "1.0.1",
+  version           = "1.0.2",
   description       = "Plot data on map projections with matplotlib",
   long_description  = """
   An add-on toolkit for matplotlib that lets you plot data


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