|
|
@ -100,6 +100,8 @@ class var:
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class DataVars(object):
|
|
|
|
class DataVars(object):
|
|
|
|
|
|
|
|
"""Класс хранения переменных шаблонов"""
|
|
|
|
|
|
|
|
|
|
|
|
class DataVarsError(Exception):
|
|
|
|
class DataVarsError(Exception):
|
|
|
|
"""Класс ошибок"""
|
|
|
|
"""Класс ошибок"""
|
|
|
|
pass
|
|
|
|
pass
|
|
|
@ -469,6 +471,31 @@ storage of variables templates")%location
|
|
|
|
valueVar = value
|
|
|
|
valueVar = value
|
|
|
|
return valueVar.encode("UTF-8")
|
|
|
|
return valueVar.encode("UTF-8")
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def GetRemoteInfo(self, envFile):
|
|
|
|
|
|
|
|
"""Получение информационных переменных
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
из файла envFile"""
|
|
|
|
|
|
|
|
optionsInfo = {}
|
|
|
|
|
|
|
|
# получить объект настроенный на ini
|
|
|
|
|
|
|
|
config = iniParser(envFile)
|
|
|
|
|
|
|
|
# получаем все секции из конфигурационного файла
|
|
|
|
|
|
|
|
allsect = config.getAllSectionNames()
|
|
|
|
|
|
|
|
if allsect:
|
|
|
|
|
|
|
|
# Секция (название сервиса)
|
|
|
|
|
|
|
|
for section in allsect:
|
|
|
|
|
|
|
|
allvars = config.getAreaVars(section)
|
|
|
|
|
|
|
|
if allvars == False:
|
|
|
|
|
|
|
|
return False
|
|
|
|
|
|
|
|
# Опции сервиса
|
|
|
|
|
|
|
|
options = {}
|
|
|
|
|
|
|
|
for varName, value in allvars.items():
|
|
|
|
|
|
|
|
varName = varName.encode("UTF-8")
|
|
|
|
|
|
|
|
value=cl_utils.convertStrListDict(value.encode("UTF-8"))
|
|
|
|
|
|
|
|
options[varName] = value
|
|
|
|
|
|
|
|
if options:
|
|
|
|
|
|
|
|
optionsInfo[section] = options
|
|
|
|
|
|
|
|
return optionsInfo
|
|
|
|
|
|
|
|
|
|
|
|
def flIniFile(self):
|
|
|
|
def flIniFile(self):
|
|
|
|
'''Заместить значение переменных значениями из ини файлов
|
|
|
|
'''Заместить значение переменных значениями из ини файлов
|
|
|
|
|
|
|
|
|
|
|
@ -547,6 +574,7 @@ storage of variables templates")%location
|
|
|
|
return foundVar
|
|
|
|
return foundVar
|
|
|
|
|
|
|
|
|
|
|
|
def getVars(self, type_names=None):
|
|
|
|
def getVars(self, type_names=None):
|
|
|
|
|
|
|
|
"""Словарь переменных для печати"""
|
|
|
|
ret = {}
|
|
|
|
ret = {}
|
|
|
|
for section, moduleVar, fillobj in self._importList:
|
|
|
|
for section, moduleVar, fillobj in self._importList:
|
|
|
|
dataVar=moduleVar.Data
|
|
|
|
dataVar=moduleVar.Data
|
|
|
@ -568,8 +596,8 @@ storage of variables templates")%location
|
|
|
|
ret[nameVar] = getattr(self, nameVar)
|
|
|
|
ret[nameVar] = getattr(self, nameVar)
|
|
|
|
return ret
|
|
|
|
return ret
|
|
|
|
|
|
|
|
|
|
|
|
#распечатать список переменных с значениями
|
|
|
|
|
|
|
|
def printVars(self,type_names=None):
|
|
|
|
def printVars(self,type_names=None):
|
|
|
|
|
|
|
|
"""распечатать список переменных с значениями"""
|
|
|
|
var=None
|
|
|
|
var=None
|
|
|
|
var=self.getVars(type_names)
|
|
|
|
var=self.getVars(type_names)
|
|
|
|
mlen_name=0;
|
|
|
|
mlen_name=0;
|
|
|
@ -587,9 +615,9 @@ storage of variables templates")%location
|
|
|
|
plist.sort()
|
|
|
|
plist.sort()
|
|
|
|
br = cl_utils.fillstr("-",mlen_name) + " " +\
|
|
|
|
br = cl_utils.fillstr("-",mlen_name) + " " +\
|
|
|
|
cl_utils.fillstr("-",mlen_mode) + " " + cl_utils.fillstr("-",10)
|
|
|
|
cl_utils.fillstr("-",mlen_mode) + " " + cl_utils.fillstr("-",10)
|
|
|
|
print "The list of variables:"
|
|
|
|
print _("The list of variables:")
|
|
|
|
print "var name".center(mlen_name),\
|
|
|
|
print _("var name").center(mlen_name),\
|
|
|
|
"Mode","Value"
|
|
|
|
_("Mode"),_("Value")
|
|
|
|
print br
|
|
|
|
print br
|
|
|
|
for i in plist:
|
|
|
|
for i in plist:
|
|
|
|
p_val=var[i].value
|
|
|
|
p_val=var[i].value
|
|
|
|