Update kwargs parsing to deal with tuples, closes #62

Author: timvink

mkdocs_table_reader_plugin/safe_eval.py

@@ -74,6 +74,7 @@ def parse_argkwarg(input_str: str):
     in_quotes = False
     quote_char = ''
     bracket_count = 0
+    tuple_count = 0
 
     for char in input_str:
         if char in "\"'" and not in_quotes:
@@ -86,7 +87,11 @@ def parse_argkwarg(input_str: str):
             bracket_count += 1
         elif char == ']':
             bracket_count -= 1
-        elif char == ',' and not in_quotes and bracket_count == 0:
+        elif char == '(':
+            tuple_count += 1
+        elif char == ')':
+            tuple_count -= 1
+        elif char == ',' and not in_quotes and bracket_count == 0 and tuple_count == 0:
             segments.append(current_segment.strip())
             current_segment = ''
             continue

setup.py

@@ -5,7 +5,7 @@
 
 setup(
     name="mkdocs-table-reader-plugin",
-    version="2.2.0",
+    version="2.2.1",
     description="MkDocs plugin to directly insert tables from files into markdown.",
     long_description=long_description,
     long_description_content_type="text/markdown",

tests/test_kwargs.py

@@ -19,4 +19,5 @@ def test_parse_argkwarg():
     assert parse_argkwarg("sep=';'") == ([], {'sep': ';'})
     assert parse_argkwarg('"file.csv", usecols=["A", "B"]') == (['file.csv'], {'usecols': ['A', 'B']})
     assert parse_argkwarg('"file.csv", usecols=[\'A\',\'B\']') == (['file.csv'], {'usecols': ['A', 'B']})
-    assert parse_argkwarg("'assets/tables/table_with_carriage_return.csv', sep = ','") == (['assets/tables/table_with_carriage_return.csv'], {'sep': ','})
+    assert parse_argkwarg("'assets/tables/table_with_carriage_return.csv', sep = ','") == (['assets/tables/table_with_carriage_return.csv'], {'sep': ','})
+    assert parse_argkwarg("'includes/statistics.csv', keep_default_na=False, colalign=('center','center','center','center','center','center','center')") == (['includes/statistics.csv'], {'keep_default_na': False, 'colalign': ('center','center','center','center','center','center','center')})