Merge pull request #223 from btharper/strings

Convert strings to Decimal values
savoirfairelinux · Jan 18, 2019 · c1292c1 · c1292c1
2 parents 83cfcdc + e459021
commit c1292c1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/num2words/__init__.py b/num2words/__init__.py
@@ -101,6 +101,8 @@ def num2words(number, ordinal=False, lang='en', to='cardinal', **kwargs):
     if lang not in CONVERTER_CLASSES:
         raise NotImplementedError()
     converter = CONVERTER_CLASSES[lang]
+    if isinstance(number, str):
+        number = converter.str_to_number(number)
     # backwards compatible
     if ordinal:
         return converter.to_ordinal(number)

diff --git a/num2words/base.py b/num2words/base.py
@@ -97,6 +97,9 @@ def parse_minus(self, num_str):
             return '%s ' % self.negword, num_str[1:]
         return '', num_str
 
+    def str_to_number(self, value):
+        return Decimal(value)
+
     def to_cardinal(self, value):
         try:
             assert int(value) == value

diff --git a/tests/test_cli.py b/tests/test_cli.py
@@ -87,7 +87,7 @@ def test_cli_default_lang(self):
         self.assertEqual(output.return_code, 0)
         self.assertEqual(
             output.out.strip(),
-            "one hundred and fifty point zero"
+            "one hundred and fifty"
         )
 
     def test_cli_with_lang(self):
@@ -97,7 +97,7 @@ def test_cli_with_lang(self):
         self.assertEqual(output.return_code, 0)
         self.assertEqual(
             output.out.strip(),
-            "ciento cincuenta punto cero"
+            "ciento cincuenta"
         )
 
     def test_cli_with_lang_to(self):