From a584d7bdabf68aac9d85bf4ed75b898325d21677 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D0=B0=D0=BC=D0=BE=D1=83=D0=BA=D0=B8=D0=BD=20=D0=90?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= <as@calculate.ru>
Date: Tue, 7 Dec 2010 16:41:13 +0300
Subject: [PATCH] Modified env function (added third argument - 'url',
 'unicode')

---
 pym/cl_template.py | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/pym/cl_template.py b/pym/cl_template.py
index 7427426..b444b6a 100644
--- a/pym/cl_template.py
+++ b/pym/cl_template.py
@@ -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)