|
|
|
@ -2406,6 +2406,8 @@ class templateFunction(_error, _shareTemplate, _shareTermsFunction):
|
|
|
|
|
"(?:[a-z]?)(?:(?:_(?:pre|p|beta|alpha|rc)\d*)*)"
|
|
|
|
|
"(?:-r\d+)?$")
|
|
|
|
|
|
|
|
|
|
reEmptyLoad = re.compile("^\s*$|^\s*;|^\s*#")
|
|
|
|
|
|
|
|
|
|
# Имя обрабатываемого шаблона
|
|
|
|
|
nameTemplate = ""
|
|
|
|
|
|
|
|
|
@ -2633,10 +2635,11 @@ class templateFunction(_error, _shareTemplate, _shareTermsFunction):
|
|
|
|
|
_("Third argument function is not 'root'"))
|
|
|
|
|
cl_overriding.exit(1)
|
|
|
|
|
if lenTerms >= 2:
|
|
|
|
|
if not terms[0] in ["ver","num","char","key"]:
|
|
|
|
|
if not terms[0] in ["ver","num","char","key","empty"]:
|
|
|
|
|
self.printErrTemplate()
|
|
|
|
|
cl_overriding.printERROR(\
|
|
|
|
|
_("first argument function is not 'ver' or 'num' or 'char'"))
|
|
|
|
|
_("first argument function is not 'ver' or 'num' or 'char'"
|
|
|
|
|
" or 'empty'"))
|
|
|
|
|
cl_overriding.exit(1)
|
|
|
|
|
|
|
|
|
|
if lenTerms == 1:
|
|
|
|
@ -2660,6 +2663,9 @@ class templateFunction(_error, _shareTemplate, _shareTermsFunction):
|
|
|
|
|
FD = open(fileName)
|
|
|
|
|
replace = FD.read().strip()
|
|
|
|
|
FD.close
|
|
|
|
|
if replace and lenTerms >= 2 and terms[0] == "empty":
|
|
|
|
|
replace ="\n".join(filter(lambda x: not self.reEmptyLoad.search(x),
|
|
|
|
|
replace.split("\n")))
|
|
|
|
|
if not replace and lenTerms >= 2 and terms[0] in ["ver","num"]:
|
|
|
|
|
replace = "0"
|
|
|
|
|
textTemplateTmp = textTemplateTmp[:resS.start()] + replace +\
|
|
|
|
|