climate-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lewi...@apache.org
Subject [4/4] climate git commit: CLIMATE-772 - Update esgf with new server name and use client rather than server certificate.
Date Fri, 25 Mar 2016 18:38:35 GMT
CLIMATE-772 - Update esgf with new server name and use client rather than server certificate.


Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/37dd5a86
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/37dd5a86
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/37dd5a86

Branch: refs/heads/master
Commit: 37dd5a86f8f5bb8489e2cc1b78689468459fce0e
Parents: bd1de04
Author: MichaelArthurAnderson <michael.arthur.anderson@gmail.com>
Authored: Fri Mar 25 11:48:04 2016 -0400
Committer: MichaelArthurAnderson <michael.arthur.anderson@gmail.com>
Committed: Fri Mar 25 11:48:04 2016 -0400

----------------------------------------------------------------------
 ocw/data_source/esgf.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/climate/blob/37dd5a86/ocw/data_source/esgf.py
----------------------------------------------------------------------
diff --git a/ocw/data_source/esgf.py b/ocw/data_source/esgf.py
index b73e2d8..be65007 100644
--- a/ocw/data_source/esgf.py
+++ b/ocw/data_source/esgf.py
@@ -22,7 +22,7 @@ import urllib2
 
 from ocw.esgf.constants import DEFAULT_ESGF_SEARCH
 from ocw.esgf.download import download
-from ocw.esgf.logon2 import logon2
+from ocw.esgf.logon import logon
 from ocw.esgf.search import SearchClient
 import ocw.data_source.local as local
 
@@ -133,7 +133,7 @@ def _get_file_download_data(dataset_id, variable, url=DEFAULT_ESGF_SEARCH):
 def _download_files(file_urls, username, password, download_directory='/tmp'):
     ''''''
     try:
-        logon2(username, password)
+        logon(username, password)
     except urllib2.HTTPError:
         raise ValueError('esgf._download_files: Invalid login credentials')
 


Mime
View raw message