git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
86266bf
)
added load_shell(). updated load(). Added 'strict' param to locate_varname()
author
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Tue, 17 Jul 2012 19:21:46 +0000
(15:21 -0400)
committer
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Tue, 17 Jul 2012 19:21:46 +0000
(15:21 -0400)
sfa/util/config.py
patch
|
blob
|
history
diff --git
a/sfa/util/config.py
b/sfa/util/config.py
index
cd3314f
..
499ab1f
100644
(file)
--- a/
sfa/util/config.py
+++ b/
sfa/util/config.py
@@
-45,16
+45,16
@@
DO NOT EDIT. This file was automatically generated at
def load(self, filename):
if filename:
def load(self, filename):
if filename:
- if filename.endswith('.xml'):
- try:
- self.load_xml(filename)
- except:
- self.config.read(filename)
- else:
+ try:
self.config.read(filename)
self.config.read(filename)
- self._files.append(filename)
- self.set_attributes()
-
+ except:
+ if filename.endswith('.xml'):
+ self.load_xml(filename)
+ else:
+ self.load_shell(filename)
+ self._files.append(filename)
+ self.set_attributes()
+
def load_xml(self, filename):
xml = XML(filename)
categories = xml.xpath('//configuration/variables/category')
def load_xml(self, filename):
xml = XML(filename)
categories = xml.xpath('//configuration/variables/category')
@@
-70,8
+70,25
@@
DO NOT EDIT. This file was automatically generated at
value = ""
self.config.set(section_name, option_name, value)
value = ""
self.config.set(section_name, option_name, value)
-
- def locate_varname(self, varname):
+ def load_shell(self, filename):
+ f = open(filename, 'r')
+ for line in f:
+ try:
+ if line.startswith('#'):
+ continue
+ parts = line.strip().split("=")
+ if len(parts) < 2:
+ continue
+ option = parts[0]
+ value = parts[1].replace('"', '').replace("'","")
+ section, var = self.locate_varname(option, strict=False)
+ if section and var:
+ self.set(section, var, value)
+ except:
+ pass
+ f.close()
+
+ def locate_varname(self, varname, strict=True):
varname = varname.lower()
sections = self.config.sections()
section_name = ""
varname = varname.lower()
sections = self.config.sections()
section_name = ""
@@
-80,8
+97,8
@@
DO NOT EDIT. This file was automatically generated at
if varname.startswith(section.lower()) and len(section) > len(section_name):
section_name = section.lower()
var_name = varname.replace(section_name, "")[1:]
if varname.startswith(section.lower()) and len(section) > len(section_name):
section_name = section.lower()
var_name = varname.replace(section_name, "")[1:]
- if not self.config.has_option(section_name, var_name):
- raise ConfigParser.NoOptionError(varname, section_name)
+ if
strict and
not self.config.has_option(section_name, var_name):
+ raise ConfigParser.NoOptionError(var
_
name, section_name)
return (section_name, var_name)
def set_attributes(self):
return (section_name, var_name)
def set_attributes(self):