From 12c9002417bde3bdc092fe496329e89db734e1c5 Mon Sep 17 00:00:00 2001 From: mpmc Date: Fri, 16 Feb 2018 08:52:23 +0000 Subject: [PATCH] Improve getAllInputs, sort the inputs list, remove unnecessary for block and attempt to strip values. --- appJar/appjar.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/appJar/appjar.py b/appJar/appjar.py index 719b8c9..a47c27c 100644 --- a/appJar/appjar.py +++ b/appJar/appjar.py @@ -9701,15 +9701,17 @@ def getAllInputs(self, **kwargs): self.getAllDatePickers(), kwargs, ]) - result = dict() + result = data = dict() for pairs in inputs: - # Remove pairs with empty values (anything that doesn't - # equal True). - data = {key: val for key, val in pairs.items() if val} - # Only add the pair if they don't already exist. - for key, val in data.items(): + for key, val in pairs.items(): + # Try and strip values. try: - if result[key]: + val = val.strip() + except AttributeError: + pass + try: + # Skip if value is empty or if key already exists. + if not val or result[key]: continue except KeyError: pass