|
|
|
@ -936,36 +936,6 @@ class DataVars(object):
|
|
|
|
|
break
|
|
|
|
|
return foundVar
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
try:
|
|
|
|
|
exec("dataVar=moduleVar.Data.%s"%nameVar)
|
|
|
|
|
except AttributeError, e:
|
|
|
|
|
pass
|
|
|
|
|
if dataVar:
|
|
|
|
|
break
|
|
|
|
|
if dataVar == False:
|
|
|
|
|
print _("Not found variable %s")%nameVar
|
|
|
|
|
if e:
|
|
|
|
|
print _("error") + ": " +str(e)
|
|
|
|
|
exit(1)
|
|
|
|
|
dataVar['service'] = section
|
|
|
|
|
# Ищем метод в объекте методов заполнения
|
|
|
|
|
nameMethod = "get_" + nameVar
|
|
|
|
|
flagFindMetod = False
|
|
|
|
|
for section, moduleVar, fillobj in self._importList:
|
|
|
|
|
if fillobj:
|
|
|
|
|
if nameMethod in dir(fillobj):
|
|
|
|
|
flagFindMetod = True
|
|
|
|
|
method = fillobj.__getattribute__(nameMethod)
|
|
|
|
|
break
|
|
|
|
|
if flagFindMetod:
|
|
|
|
|
return (dataVar,method)
|
|
|
|
|
else:
|
|
|
|
|
return (dataVar,False)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def getVars(self, type_names=None):
|
|
|
|
|
ret = {}
|
|
|
|
|
for section, moduleVar, fillobj in self._importList:
|
|
|
|
|