From d966c5d5189ef965fc975156f16921679d5769b8 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?=
 <asamoukin@asamoukin.local.calculate.ru>
Date: Wed, 5 May 2010 14:53:36 +0400
Subject: [PATCH] Modify DataVars.defined

---
 pym/cl_datavars.py | 18 +++++++++++-------
 pym/cl_template.py |  1 -
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/pym/cl_datavars.py b/pym/cl_datavars.py
index 8d795b2..68f2f80 100644
--- a/pym/cl_datavars.py
+++ b/pym/cl_datavars.py
@@ -497,25 +497,29 @@ storage of variables templates")%location
 
 
     def defined(self, vname):
-        """Установлена ли переменная"""
-        if hasattr(self, vname):
+        """Имеет ли значение переменная"""
+        try:
+            value = self.Get(vname)
+        except:
+            print _("error var %s not found")%str(vname)
+            cl_overriding.exit(1)
+        if value:
             return True
-        return False
+        else:
+            return False
 
     #def defined(self, vname):
         #return True
 
-
-
     def exists(self, nameVar):
         """ Определяет существует ли переменная с таким имененм
         """
-        if self.__dict__.has_key(nameVar):
+        if hasattr(self, nameVar):
             return True
         foundVar = False
         # Ищем переменную в импортируемых модулях
         for section, moduleVar, fillobj in self._importList:
-            if moduleVar.Data.__dict__.has_key(nameVar):
+            if hasattr(moduleVar.Data, nameVar):
                 foundVar = True
                 break
         return foundVar
diff --git a/pym/cl_template.py b/pym/cl_template.py
index 6d049b3..464e8d2 100644
--- a/pym/cl_template.py
+++ b/pym/cl_template.py
@@ -2849,7 +2849,6 @@ class templateFunction(_error, _shareTemplate, _shareTermsFunction):
         # Регулярное выражение для поиска функции в шаблоне
         reFunc = self._reFunc
         resS = reFunc.search(textTemplate)
-        print resS
         textTemplateTmp = textTemplate
         flagIniFunc = False
         while resS: