Modified env function (added third argument - 'url', 'unicode')

develop
Самоукин Алексей 14 years ago
parent 8f42190122
commit a584d7bdab

@ -2899,6 +2899,29 @@ or 'lower' or 'capitalize'"))
# Значение локальной переменной
valueLocVar = terms[1]
self.currDictIni[nameLocVar] = valueLocVar
elif len(terms) == 3:
if not terms[2] in ['url','unicode']:
self.printErrTemplate()
cl_overriding.printERROR(_("third argument function is not "
"'url' or 'unicode'"))
cl_overriding.exit(1)
if terms[1]:
self.printErrTemplate()
cl_overriding.exit(1)
if self.timeIni != curTime:
# читаем переменные из файла
self.prevDictIni = self.loadVarsIni(self.fileConfigIni)
self.currDictIni= {}
self.currDictIni.update(self.prevDictIni)
self.timeIni = self.getTimeFile(self.fileConfigIni)
if nameLocVar in self.currDictIni.keys():
unicodeValue = self.currDictIni[nameLocVar]
if terms[2] == 'url':
replace = unicodeValue.encode("UTF-8").\
__repr__()[1:-1].replace('\\x','%').\
replace(' ','%20')
elif terms[2] == 'unicode':
replace = unicodeValue.__repr__()[2:-1]
else:
self.printErrTemplate()
cl_overriding.exit(1)

Loading…
Cancel
Save