SF.net SVN: matplotlib:[6066] trunk/toolkits/basemap/lib/mpl_toolkits/ basemap

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

Revision: 6066
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6066&view=rev
Author:   jswhit
Date:     2008-09-05 02:02:49 +0000 (Fri, 05 Sep 2008)

Log Message:
-----------
allow for username and password for remote opendap datasets.

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

Modified: trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py
===================================================================
--- trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py	2008-09-04 19:56:37 UTC (rev 6065)
+++ trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py	2008-09-05 02:02:49 UTC (rev 6066)
@@ -3646,7 +3646,7 @@
     else:
         return corners
 
-def NetCDFFile(file, mode='r', maskandscale=True):
+def NetCDFFile(file, mode='r', maskandscale=True, username=None, password=None):
     """NetCDF File reader/writer.  API is the same as Scientific.IO.NetCDF.
 
     If ``file`` is a URL that starts with `http`, it is assumed
@@ -3668,7 +3668,7 @@
 
     """
     if file.startswith('http'):
-        return netcdf._RemoteFile(file,maskandscale=maskandscale)
+        return netcdf._RemoteFile(file,maskandscale=maskandscale,username=username,password=password)
     else:
         return netcdf.netcdf_file(file,mode=mode,maskandscale=maskandscale)
 

Modified: trunk/toolkits/basemap/lib/mpl_toolkits/basemap/netcdf.py
===================================================================
--- trunk/toolkits/basemap/lib/mpl_toolkits/basemap/netcdf.py	2008-09-04 19:56:37 UTC (rev 6065)
+++ trunk/toolkits/basemap/lib/mpl_toolkits/basemap/netcdf.py	2008-09-05 02:02:49 UTC (rev 6066)
@@ -8,8 +8,8 @@
 class _RemoteFile(object):
     """A NetCDF file reader. API is the same as Scientific.IO.NetCDF."""
 
-    def __init__(self, file, maskandscale=False):
-        self._buffer = open_remote(file)
+    def __init__(self, file, maskandscale=False, username=None, password=None):
+        self._buffer = open_remote(file,username=username,password=password)
         self._maskandscale = maskandscale
         self._parse()
 


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