From fa41495e6a967e78c56f1d093524112ee3be3153 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 9 Nov 2022 12:20:28 +0300 Subject: [PATCH] =?UTF-8?q?=09=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D0=BE:=20=20=20=20=20=20pym/calculate/lib/datavars.py?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pym/calculate/lib/datavars.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pym/calculate/lib/datavars.py b/pym/calculate/lib/datavars.py index 838ac42..02788c0 100644 --- a/pym/calculate/lib/datavars.py +++ b/pym/calculate/lib/datavars.py @@ -1068,6 +1068,8 @@ class SimpleDataVars(): val = str(val) if val == "": return [] + elif val.startswith('\n') or val.startswith(' \n'): + return [{x.split(':')[0]: list(map(str.strip, x.split(':', maxsplit=1)[1].split(','))) for x in val.split("\n") if len(x)>2}] return [fixEmpty(x) for x in val.split(delimeter)] return wrapper @@ -1086,9 +1088,9 @@ class SimpleDataVars(): """ if "humanreadable" in kw: hr = kw['humanreadable'] - return list(zip(*(self.Get(x, humanreadable=hr) for x in argvVarNames))) + return list(zip(*(self.Get(x, humanreadable=hr)if isinstance(x, str) else x for x in argvVarNames))) else: - return list(zip(*(self.Get(x) for x in argvVarNames))) + return list(zip(*(self.Get(x) if isinstance(x, str) else x for x in argvVarNames))) def select(self, *fields, **kw): """