[Bf-extensions-cvs] [829154dd] master: Fix T61275: recognize values with decimal separator in svg importer

[Jacques Lucke]

Commit: 829154dd125ef84c59ebfad92031368853e18b7f
Author: Jacques Lucke
Date:   Thu Feb 7 10:53:58 2019 +0100
Branches: master
https://developer.blender.org/rBA829154dd125ef84c59ebfad92031368853e18b7f

Fix T61275: recognize values with decimal separator in svg importer

===================================================================

M	io_curve_svg/svg_util.py
M	io_curve_svg/svg_util_test.py

===================================================================

diff --git a/io_curve_svg/svg_util.py b/io_curve_svg/svg_util.py
index a3e1613c..056a19a6 100644
--- a/io_curve_svg/svg_util.py
+++ b/io_curve_svg/svg_util.py
@@ -31,7 +31,7 @@ def check_points_equal(point_a, point_b):
     return (abs(point_a[0] - point_b[0]) < 1e-6 and
             abs(point_a[1] - point_b[1]) < 1e-6)
 
-match_number = r"-?\d+([eE][-+]?\d+)?"
+match_number = r"-?\d+(\.\d+)?([eE][-+]?\d+)?"
 match_first_comma = r"^\s*(?=,)"
 match_comma_pair = r",\s*(?=,)"
 match_last_comma = r",\s*$"
diff --git a/io_curve_svg/svg_util_test.py b/io_curve_svg/svg_util_test.py
index b3ecda83..031c0c17 100755
--- a/io_curve_svg/svg_util_test.py
+++ b/io_curve_svg/svg_util_test.py
@@ -66,6 +66,12 @@ class ParseArrayOfFloatsTest(unittest.TestCase):
     def test_all_commas(self):
         self.assertEqual(parse_array_of_floats(",,,"), [0, 0, 0, 0])
 
+    def test_value_with_decimal_separator(self):
+        self.assertEqual(parse_array_of_floats("3.5"), [3.5])
+
+    def test_comma_separated_values_with_decimal_separator(self):
+        self.assertEqual(parse_array_of_floats("2.75,8.5"), [2.75, 8.5])
+
 
 if __name__ == '__main__':
     unittest.main(verbosity=2)