climate-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jo...@apache.org
Subject [03/11] git commit: CLIMATE-519 - Rework ESGF helper module import structuring
Date Mon, 27 Oct 2014 19:19:53 GMT
CLIMATE-519 - Rework ESGF helper module import structuring

Update ESGF module imports to reflect new package/module structuring.


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

Branch: refs/heads/master
Commit: 79464c74823c7234eb44c6af1b4d8bf29a8e4cd9
Parents: 7d3c237
Author: Michael Joyce <joyce@apache.org>
Authored: Mon Sep 15 08:06:04 2014 -0700
Committer: Michael Joyce <joyce@apache.org>
Committed: Sun Oct 19 14:18:05 2014 -0700

----------------------------------------------------------------------
 ocw/esgf/download.py |  2 +-
 ocw/esgf/logon.py    |  2 +-
 ocw/esgf/logon2.py   |  4 ++--
 ocw/esgf/main.py     | 10 +++++-----
 ocw/esgf/search.py   |  2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/climate/blob/79464c74/ocw/esgf/download.py
----------------------------------------------------------------------
diff --git a/ocw/esgf/download.py b/ocw/esgf/download.py
index 389b982..d643de8 100644
--- a/ocw/esgf/download.py
+++ b/ocw/esgf/download.py
@@ -24,7 +24,7 @@ RCMES module to download a file from ESGF.
 import urllib2, httplib
 from os.path import expanduser, join
 
-from esgf.rcmes.constants import ESGF_CREDENTIALS
+from ocw.esgf.constants import ESGF_CREDENTIALS
 
 class HTTPSClientAuthHandler(urllib2.HTTPSHandler):
     '''

http://git-wip-us.apache.org/repos/asf/climate/blob/79464c74/ocw/esgf/logon.py
----------------------------------------------------------------------
diff --git a/ocw/esgf/logon.py b/ocw/esgf/logon.py
index 0a6f4f7..c7f3478 100644
--- a/ocw/esgf/logon.py
+++ b/ocw/esgf/logon.py
@@ -23,7 +23,7 @@ RCMES module to logon onto the ESGF.
 from pyesgf.logon import LogonManager
 import os
 
-from esgf.rcmes.constants import JPL_MYPROXY_SERVER_DN
+from ocw.esgf.constants import JPL_MYPROXY_SERVER_DN
 
 def logon(openid, password):
     '''

http://git-wip-us.apache.org/repos/asf/climate/blob/79464c74/ocw/esgf/logon2.py
----------------------------------------------------------------------
diff --git a/ocw/esgf/logon2.py b/ocw/esgf/logon2.py
index 11a808a..46724f7 100644
--- a/ocw/esgf/logon2.py
+++ b/ocw/esgf/logon2.py
@@ -20,7 +20,7 @@
 RCMES module to logon onto the ESGF by contacting the IdP RESTful service.
 '''
 
-from esgf.rcmes.constants import ESGF_CREDENTIALS, CERT_SERVICE_URL, REALM
+from ocw.esgf.constants import ESGF_CREDENTIALS, CERT_SERVICE_URL, REALM
 
 import urllib2
 from os.path import expanduser
@@ -40,4 +40,4 @@ def logon2(openid, password):
     
     localFilePath = expanduser(ESGF_CREDENTIALS)
     certFile=open(localFilePath, 'w')
-    certFile.write(request.read())
\ No newline at end of file
+    certFile.write(request.read())

http://git-wip-us.apache.org/repos/asf/climate/blob/79464c74/ocw/esgf/main.py
----------------------------------------------------------------------
diff --git a/ocw/esgf/main.py b/ocw/esgf/main.py
index 4ffadcc..65c2a1c 100644
--- a/ocw/esgf/main.py
+++ b/ocw/esgf/main.py
@@ -26,10 +26,10 @@ USER_OPENID = "https://esg-datanode.jpl.nasa.gov/esgf-idp/openid/lucacinquini"
 USER_PASSWORD = "*****"
 DATA_DIRECTORY = "/tmp"
 
-from esgf.rcmes.logon import logon
-from esgf.rcmes.logon2 import logon2
-from esgf.rcmes.search import SearchClient
-from esgf.rcmes.download import download
+from ocw.esgf.logon import logon
+from ocw.esgf.logon2 import logon2
+from ocw.esgf.search import SearchClient
+from ocw.esgf.download import download
 
 def main():
     '''Example driver program'''
@@ -113,4 +113,4 @@ def main_obs4mips():
     return urls
 
 if __name__ == '__main__':
-    main()
\ No newline at end of file
+    main()

http://git-wip-us.apache.org/repos/asf/climate/blob/79464c74/ocw/esgf/search.py
----------------------------------------------------------------------
diff --git a/ocw/esgf/search.py b/ocw/esgf/search.py
index 3a81f24..a8790b3 100644
--- a/ocw/esgf/search.py
+++ b/ocw/esgf/search.py
@@ -23,7 +23,7 @@ RCMES module to execute a faceted search for ESGF files.
 
 from pyesgf.search import SearchConnection
 
-from esgf.rcmes.constants import JPL_SEARCH_SERVICE_URL
+from ocw.esgf.constants import JPL_SEARCH_SERVICE_URL
 
 class SearchClient():
     """


Mime
View raw message