Bug out early once valid from unit is found and remainer is not a val…

…id unit. Makes error messages more understandable, as it now correctly identifies at least one unit.
deanishe · Nov 26, 2015 · 48db8ad · 48db8ad
1 parent a6f2c2a
commit 48db8ad
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/Convert-2.2.1.alfredworkflow → Convert-2.3.alfredworkflow b/Convert-2.2.1.alfredworkflow → Convert-2.3.alfredworkflow
diff --git a/src/convert.py b/src/convert.py
@@ -128,11 +128,18 @@ def convert(query, decimal_places=2):
             continue
         try:
             from_unit = ureg.Quantity(qty, q1)
-            to_unit = ureg.Quantity(1, q2)
-        except UndefinedUnitError:  # Didn't make sense; try again
+        except UndefinedUnitError:
             continue
+        else:
+            log.debug('From unit : %s', q1)
+            try:
+                to_unit = ureg.Quantity(1, q2)
+            except UndefinedUnitError:  # Didn't make sense; try again
+                raise ValueError('Unknown unit : %s' % q2)
+
         log.debug("from '%s' to '%s'", from_unit.units, to_unit.units)
         break  # Got something!
+
     # Throw error if we arrive here with no units
     if from_unit is None:
         raise ValueError('Unknown unit : %s' % q1)

diff --git a/src/version b/src/version
@@ -1 +1 @@
-2.2.1
+2.3