diff --git a/pym/cl_profile.py b/pym/cl_profile.py index 288218f..96818b5 100644 --- a/pym/cl_profile.py +++ b/pym/cl_profile.py @@ -150,12 +150,13 @@ class _terms(_error): flagIntTypeVar = None if flagFunction: valVars = function("#-%s-#"%vals[0]) - if valVars == "": - flagFunction = False - if valVars == False: + if valVars is False: self.setError("'%s'"%term + " " + _("incorrect")) self.setError(textError) return False + if valVars == "" and\ + not self._re_not_Version.search(vals[1]): + valVars = "0" if "load" == searchFunct.group(1): if re.search("\(\s*num\s*,",vals[0]): if valVars: @@ -179,19 +180,17 @@ class _terms(_error): # Номера версий для ini flagNotIniFunct = True if flagFunction and "ini" == searchFunct.group(1): - # Если значение функции и значение версия - if not self._re_not_Version.search(vals[1]): - if not valVars: - valVars = "0" - if not self._re_not_Version.search(valVars): - verFile, verVar = self._convertVers(vals[1],valVars) - exec(\ - "res=("+"'"+verVar+"'"+sepF+"'"+verFile+"'"+")") - if res: - listEqual.append("1") - else: - listEqual.append("0") - flagNotIniFunct = False + # Если номер версии в двух аргументах + if not self._re_not_Version.search(vals[1]) and\ + not self._re_not_Version.search(valVars): + verFile, verVar = self._convertVers(vals[1],valVars) + exec(\ + "res=("+"'"+verVar+"'"+sepF+"'"+verFile+"'"+")") + if res: + listEqual.append("1") + else: + listEqual.append("0") + flagNotIniFunct = False # Cравниваем номера версий if flagNotIniFunct: if "_ver" in vals[0] or \ @@ -2128,7 +2127,7 @@ class utfBin: while 1: if utf[ind] == '_fb_': res, l = self._sumbUtf(utf[ind:],lenUtf[ind]) - if res == False: + if res is False: indErr.append(ind) if l>0: ind +=l @@ -3474,7 +3473,7 @@ class profile(_file, _terms, xmlShare, processingTemplates): self.changeDirs[path] = pathDir crDirs = self.createDir(prefix, path, self._baseDir, pathDir) - if crDirs == False: + if crDirs is False: return False self.createdDirs += crDirs else: