From 3cd692bbb34e3005615419f66c368038c7ec1bf5 Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Fri, 4 May 2018 10:37:15 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20calculate-utils?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Исправлена обработка параметров для функций mergepkg и merge --- pym/calculate/lib/cl_template.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pym/calculate/lib/cl_template.py b/pym/calculate/lib/cl_template.py index bf6a9f3..23dcb5e 100644 --- a/pym/calculate/lib/cl_template.py +++ b/pym/calculate/lib/cl_template.py @@ -3325,9 +3325,9 @@ class templateFunction(_error, _warning, _shareTemplate, _shareTermsFunction, :param nameTemp: :return: """ - terms = funArgv.replace(" ", "").split(",") - funcPkg = terms[0] - funcMerge = terms[0].partition(":")[0].partition("[")[0] + term = funArgv.replace(" ", "") + funcPkg = term + funcMerge = term.partition(":")[0].partition("[")[0] replace = self.funcMerge(funcMerge, resS, localVars, "", nameTemp) if replace == "1": replace = self.funcPkg(funcPkg, resS, localVars, "", nameTemp) @@ -3371,10 +3371,8 @@ class templateFunction(_error, _warning, _shareTemplate, _shareTermsFunction, return True return False - terms = funArgv.replace(" ", "").split(",") - if len(terms) != 1: - raise self.raiseErrTemplate() - funcPkg = terms[0] + term = funArgv.replace(" ", "") + funcPkg = term funcPkg, spl, uses = funcPkg.partition('[') if uses: uses = uses.rstrip("]")