-

cool-RR · cool-RR · commit abcb5afac993 · 2014-03-30T17:22:44.000+03:00
diff --git a/source_py3/python_toolbox/misc_tools/misc_tools.py b/source_py3/python_toolbox/misc_tools/misc_tools.py
@@ -341,6 +341,18 @@ def pocket(*args):
 _decimal_number_pattern = \
                    re.compile('''^-?(?:(?:[0-9]+(?:.[0-9]*)?)|(?:.[0-9]+))$''')
 def decimal_number_from_string(string):
+    '''
+    Turn a string like '7' or '-32.55' into the corresponding number.
+    
+    Ensures that it was given a number. (This might be more secure than using
+    something like `int` directly.)
+    
+    Uses `int` for ints and `float` for floats.
+    '''
+    if isinstance(string, bytes):
+        string = string.decode()
+    if not isinstance(string, str):
+        raise Exception("%s isn't a decimal number." % string)
     if not _decimal_number_pattern.match(string):
         raise Exception("%s isn't a decimal number." % string)
     return float(string) if '.' in string else int(string)
diff --git a/source_py3/test_python_toolbox/test_misc_tools/test_decimal_number_from_string.py b/source_py3/test_python_toolbox/test_misc_tools/test_decimal_number_from_string.py
@@ -0,0 +1,21 @@
+# Copyright 2009-2014 Ram Rachum.
+# This program is distributed under the MIT license.
+
+'''Testing module for `find_clear_place_on_circle`.'''
+
+import nose.tools
+
+from python_toolbox import cute_testing
+
+from python_toolbox.misc_tools import decimal_number_from_string
+
+
+def test():
+    assert decimal_number_from_string('7') == 7
+    assert type(decimal_number_from_string('7')) == int
+    assert decimal_number_from_string('-12.34') == -12.34
+    assert type(decimal_number_from_string('-12.34')) == float
+    with cute_testing.RaiseAssertor():
+        decimal_number_from_string(31412)
+    with cute_testing.RaiseAssertor():
+        decimal_number_from_string('JJfa')
