Unified handling of remove keywords in job configuration, added remove keyword...

Unified handling of remove keywords in job configuration, added remove keyword for namelist variables

mkexp

@@ -116,18 +116,24 @@ def format_value(value, indent):
         return (',\n' + ' '*indent).join(lines)
     return format_atom(value)
 
+def cut_remove_list(section, key):
+    remove_list = []
+    if key in section:
+        if isinstance(section[key], basestring):
+            remove_list = [section[key]]
+        else:
+            remove_list = section[key]
+        del section[key]
+    return remove_list
+
 def format_namelist(section):
     '''Format config section as a namelist'''
     # Settings
     base_indent = 4
-    # Create list of removed namelist groups
-    remove_list = []
-    if 'remove' in section:
-        if isinstance(section['remove'], basestring):
-            remove_list = [section['remove']]
-        else:
-            remove_list = section['remove']
-        del section['remove']
+    # Create list of removed namelist groups.
+    # Support old keyword for backward compatibility
+    remove_list = cut_remove_list(section, '.remove')
+    remove_list += cut_remove_list(section, 'remove')
     black_list = map(lambda x: x.replace(r'\*', '.*').replace(r'\?', '.')+'$', 
                      map(lambda x: re.escape(x.lower()), remove_list))
     # Format namelist groups that were not removed
@@ -136,21 +142,24 @@ def format_namelist(section):
         if isinstance(contents, dict):
             group = group.lower()
             if not any(map(lambda x: re.match(x, group), black_list)):
+                # Create list of removed keys
+                remove_keys = cut_remove_list(contents, '.remove')
                 group_name = re.sub(r' .*$', '', group)
                 lines.write('&'+group_name+'\n')
                 for key, value in contents.iteritems():
-                    key = key.lower()
-                    indent = base_indent + len(key) + 3
-                    for line in contents.comments.get(key, []):
-                        if line:
-                            lines.write(' '*base_indent+
-                                        re.sub(r'^#', '!', line)+'\n')
-                    line = contents.inline_comments[key]
-                    if not line:
-                        line = ''
-                    line = re.sub(r'^#', ' !', line)
-                    lines.write(' '*base_indent+key+' = '+
-                                format_value(value, indent)+line+'\n')
+                    if key not in remove_keys:
+                        key = key.lower()
+                        indent = base_indent + len(key) + 3
+                        for line in contents.comments.get(key, []):
+                            if line:
+                                lines.write(' '*base_indent+
+                                            re.sub(r'^#', '!', line)+'\n')
+                        line = contents.inline_comments[key]
+                        if not line:
+                            line = ''
+                        line = re.sub(r'^#', ' !', line)
+                        lines.write(' '*base_indent+key+' = '+
+                                    format_value(value, indent)+line+'\n')
                 lines.write('/\n')
     return lines.getvalue()
 
@@ -243,16 +252,11 @@ if work_dir != data_dir:
 
 # Cut queue specific settings
 job_dict = {}
-remove_list = []
+remove_list = cut_remove_list(config['jobs'], '.remove')
+remove_list += cut_remove_list(config['jobs'], 'remove')
 for key, value in config['jobs'].iteritems():
     if not isinstance(value, dict):
-        if key == 'remove':
-            if isinstance(value, basestring):
-                remove_list = [value]
-            else:
-                remove_list = value
-        else:
-            job_dict[key] = value
+        job_dict[key] = value
         del config['jobs'][key]
 
 # Save configuration to buffer