Fix calculate template conditions

develop
Хирецкий Михаил 14 years ago
parent 77d5f78dfc
commit b63a9c3646

@ -130,8 +130,9 @@ class _terms(_error, _shareTermsFunction):
if k == " and ": if k == " and ":
flagOR = False flagOR = False
if listEqual == [] or False in listEqual: if listEqual == [] or False in listEqual:
listEqual = [] # listEqual = []
break # break
listEqual = [False]
else: else:
listEqual = [True] listEqual = [True]
# если or # если or
@ -144,8 +145,10 @@ class _terms(_error, _shareTermsFunction):
listEqual = [True] listEqual = [True]
flagOR = True flagOR = True
else: else:
if flagOR: #if flagOR:
continue # continue
if flagOR and listEqual and all(listEqual):
break
#проверка на допустимость названия переменной #проверка на допустимость названия переменной
flagFunction = False flagFunction = False
if self._reDenyName.search(vals[0]): if self._reDenyName.search(vals[0]):

Loading…
Cancel
Save