|
|
|
@ -880,7 +880,7 @@ class DataVars(object):
|
|
|
|
|
# получаем полный путь до файла ini
|
|
|
|
|
if location == 'default':
|
|
|
|
|
name_calculate_ini = calculate_ini[3]
|
|
|
|
|
if location == 'custom':
|
|
|
|
|
elif location == 'custom':
|
|
|
|
|
name_calculate_ini = calculate_ini[2]
|
|
|
|
|
elif location == 'local':
|
|
|
|
|
name_calculate_ini = calculate_ini[1]
|
|
|
|
@ -921,7 +921,7 @@ class DataVars(object):
|
|
|
|
|
# получаем полный путь до файла ini
|
|
|
|
|
if location == 'default':
|
|
|
|
|
name_calculate_ini = calculate_ini[3]
|
|
|
|
|
if location == 'custom':
|
|
|
|
|
elif location == 'custom':
|
|
|
|
|
name_calculate_ini = calculate_ini[2]
|
|
|
|
|
elif location == 'local':
|
|
|
|
|
name_calculate_ini = calculate_ini[1]
|
|
|
|
@ -1033,7 +1033,7 @@ class DataVars(object):
|
|
|
|
|
value = cl_utils.convertStrListDict(v.encode("UTF-8"))
|
|
|
|
|
self.Set(k, value, True)
|
|
|
|
|
importFileVars[k] = value
|
|
|
|
|
if i < 3:
|
|
|
|
|
if i < 4:
|
|
|
|
|
importVars[locations[i]] = importFileVars
|
|
|
|
|
i += 1
|
|
|
|
|
return importVars
|
|
|
|
|