From fbcaf002397b47af57c95c047c963b031e9bfdcd Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Mon, 7 Oct 2013 12:48:21 +0400 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5?= =?UTF-8?q?=D1=82=D1=80=D0=BE=D0=B2=20=D0=B2=D1=8B=D0=B1=D0=BE=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- calculate/lib/datavars.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/calculate/lib/datavars.py b/calculate/lib/datavars.py index a4f31e2..4a22976 100644 --- a/calculate/lib/datavars.py +++ b/calculate/lib/datavars.py @@ -1549,7 +1549,11 @@ class DataVars(SimpleDataVars): if varObj.type == "choice": choicedata = self.ChoiceAndComments(var) if any(choicedata): - choicedata = zip(*choicedata) + if choicedata[1] is None: + choicedata = [choicedata[0], + choicedata[0]] + else: + choicedata = zip(*choicedata) if not val in map(lambda x:x[0],choicedata): result = filter(lambda x:( _toUNICODE(val).lower() in _toUNICODE(x[0]).lower() or \