|
|
|
@ -30,7 +30,7 @@ from itertools import *
|
|
|
|
|
import operator
|
|
|
|
|
import traceback
|
|
|
|
|
from types import StringTypes
|
|
|
|
|
import configparser
|
|
|
|
|
from ConfigParser import ConfigParser
|
|
|
|
|
|
|
|
|
|
def addStdConfig(fileLst,prefix='/'):
|
|
|
|
|
stdPath = path.join(prefix,
|
|
|
|
@ -797,7 +797,7 @@ class SimpleDataVars:
|
|
|
|
|
Read variable values from ini files.
|
|
|
|
|
Return False if ini file is invalid.
|
|
|
|
|
"""
|
|
|
|
|
config = configparser.ConfigParser(strict=False)
|
|
|
|
|
config = ConfigParser()
|
|
|
|
|
if path.isdir(iniFile):
|
|
|
|
|
config.read(addStdConfig(
|
|
|
|
|
searchProfile(iniFile, 'calculate.env'),
|
|
|
|
@ -1001,7 +1001,7 @@ class DataVars(SimpleDataVars):
|
|
|
|
|
retVal = ""
|
|
|
|
|
for iniFile in calculateIniFiles:
|
|
|
|
|
if path.exists(iniFile):
|
|
|
|
|
config = configparser.ConfigParser(strict=False)
|
|
|
|
|
config = ConfigParser()
|
|
|
|
|
config.read(iniFile)
|
|
|
|
|
try:
|
|
|
|
|
data = config[section][varname]
|
|
|
|
@ -1021,7 +1021,7 @@ class DataVars(SimpleDataVars):
|
|
|
|
|
section2 : { variable : value }
|
|
|
|
|
"""
|
|
|
|
|
optionsInfo = {}
|
|
|
|
|
config = configparser.ConfigParser(strict=False)
|
|
|
|
|
config = ConfigParser()
|
|
|
|
|
config.read(envFile)
|
|
|
|
|
allsect = config.sections()
|
|
|
|
|
for section in allsect:
|
|
|
|
@ -1055,7 +1055,7 @@ class DataVars(SimpleDataVars):
|
|
|
|
|
for iniName,iniFile in profiles+\
|
|
|
|
|
self.Get('main.cl_env_data'):
|
|
|
|
|
if path.exists(iniFile) or iniName == 'profile':
|
|
|
|
|
config = configparser.ConfigParser(strict=False)
|
|
|
|
|
config = ConfigParser()
|
|
|
|
|
if iniName == 'profile':
|
|
|
|
|
config.read(addStdConfig(
|
|
|
|
|
searchProfile(iniFile,'calculate.env')))
|
|
|
|
|