Fix for get_numeric_if_possible(-xxx)

OCHA-DAP · Oct 21, 2020 · 4b8a01b · 4b8a01b
1 parent 6b05b71
commit 4b8a01b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/src/hdx/utilities/text.py b/src/hdx/utilities/text.py
@@ -318,6 +318,12 @@ def get_int_value(val, denominator):
     if isinstance(value, str):
         val = value.strip()
         if val != '' and only_allowed_in_str(val, allowed_numeric):
+            try:
+                minusindex = val.index('-')
+                if minusindex != 0:
+                    return val
+            except ValueError:
+                pass
             try:
                 commaindex = val.index(',')
             except ValueError:

diff --git a/tests/hdx/utilities/test_text.py b/tests/hdx/utilities/test_text.py
@@ -98,14 +98,17 @@ def test_get_numeric_if_possible(self):
         assert get_numeric_if_possible('') == ''
         assert get_numeric_if_possible('hello') == 'hello'
         assert get_numeric_if_possible('123') == 123
+        assert get_numeric_if_possible('-123') == -123
         assert get_numeric_if_possible('123.45') == 123.45
+        assert get_numeric_if_possible('-123.45') == -123.45
         assert get_numeric_if_possible('123,123,123.45') == 123123123.45
         assert get_numeric_if_possible('123.123.123,45') == 123123123.45
         assert get_numeric_if_possible('123,123,123') == 123123123
         assert get_numeric_if_possible('123.123.123') == 123123123
         assert get_numeric_if_possible('12.3%') == approx(0.123)
         assert get_numeric_if_possible('10%') == 0.1
         assert get_numeric_if_possible('-10%') == -0.1
+        assert get_numeric_if_possible('10-') == '10-'
         assert get_numeric_if_possible('123,123.45%') == 1231.2345
         assert get_numeric_if_possible('-123,123.45%') == -1231.2345
         assert get_numeric_if_possible('123.123,45%') == 1231.2345