Changeset 2464 for TOOLS/ConsoGENCMIP6/bin/libconso.py

Timestamp:

04/02/15 13:21:49 (9 years ago)

Author:

labetoulle

Message:

• Use allow_no_value option from ConfigParser?, for dods directory in config.ini
• keep default config.ini.init on svn instead of config.ini, which is to be adapted to each implementation
• debug project_name processing

Location:

TOOLS/ConsoGENCMIP6/bin

Files:

• . (modified) (1 prop)
• libconso.py (modified) (4 diffs)

TOOLS/ConsoGENCMIP6/bin

@@ -1 +1 @@
 *.pyc
+config.ini

@@ -1 +1 @@
 *.pyc
+config.ini

TOOLS/ConsoGENCMIP6/bin/libconso.py

@@ -52 +52 @@
   OUT = {}
 
-  config = cp.ConfigParser()
+  config = cp.ConfigParser(allow_no_value=True)
   config.optionxform = str
   config.read(filename)
@@ -71 +71 @@
   section = "directories"
   for option in config.options(section):
-    res = config.get(section, option)
-    if res != "None":
-      DIR[option] = res
-    else:
-      DIR[option] = None
+    DIR[option] = config.get(section, option)
 
     if DIR[option] and not os.path.isdir(DIR[option]):
@@ -221 +217 @@
 
   #---------------------------------------
-  def __init__(self):
-    self.project   = ""
+  def __init__(self, project_name):
+    self.project   = project_name
     self.date_init = ""
     self.deadline  = ""
@@ -231 +227 @@
     import json
     dico = json.load(open(filein, "r"))
-    self.project = dico["name"]
     self.deadline = string_to_date(dico["deadline"]) + \
                     dt.timedelta(days=-1)

@@ -1 +1 @@
 *.pyc
+config.ini