Merge pull request #145 from static-frame/143/pyi-improvements

Updates to .pyi file

Author: flexatone

src/__init__.pyi

@@ -78,8 +78,8 @@ def delimited_to_arrays(
         line_select: tp.Optional[tp.Callable[[int], bool]] = None,
         delimiter: str = ',',
         doublequote: bool = True,
-        escapechar: str = '',
-        quotechar: str = '"',
+        escapechar: tp.Optional[str] = '',
+        quotechar: tp.Optional[str] = '"',
         quoting: int = 0,
         skipinitialspace: bool = False,
         strict: bool = False,
@@ -93,8 +93,8 @@ def split_after_count(
         delimiter: str = ',',
         count: int = 0,
         doublequote: bool = True,
-        escapechar: str = '',
-        quotechar: str = '"',
+        escapechar: tp.Optional[str] = '',
+        quotechar: tp.Optional[str] = '"',
         quoting: int = 0,
         strict: bool = False,
         ) -> tp.Tuple[str, str]: ...

src/_arraykit.c

@@ -319,7 +319,7 @@ AK_set_int(const char *name,
     return 0;
 }
 
-// Set a character from `src` on `target`; if src is NULL use default. Returns -1 on error, else 0.
+// Set a character from `src` on `target`; if src is NULL use default. Returns -1 on error, else 0. If a None is given, a null char will be assigned.
 static int
 AK_set_char(const char *name,
         Py_UCS4 *target,

test/test_delimited_to_arrays.py

@@ -871,6 +871,12 @@ def test_delimited_to_arrays_delimiter_a(self) -> None:
         with self.assertRaises(TypeError):
             _ = delimited_to_arrays(msg, axis=1, delimiter='foo')
 
+    def test_delimited_to_arrays_delimiter_b(self) -> None:
+        msg  = ['a,3,True', 'b,-1,False']
+        with self.assertRaises(TypeError):
+            _ = delimited_to_arrays(msg, axis=1, delimiter=None)
+
+
     #---------------------------------------------------------------------------
     def test_delimited_to_arrays_escapechar_a(self) -> None:
         msg  = ['a,3,True', 'b,-1,False']
@@ -889,6 +895,15 @@ def test_delimited_to_arrays_escapechar_b(self) -> None:
         self.assertEqual([a.tolist() for a in post1],
                 [['f"oo', 'b,ar'], [3, -1], [True, False]])
 
+    def test_delimited_to_arrays_escapechar_c(self) -> None:
+        msg  = ['foo,3,True', 'bar,-1,False']
+        post1 = delimited_to_arrays(msg,
+                axis=1,
+                escapechar=None,
+                )
+        self.assertEqual([a.tolist() for a in post1],
+                [['foo', 'bar'], [3, -1], [True, False]])
+
     #---------------------------------------------------------------------------
     def test_delimited_to_arrays_quotechar_a(self) -> None:
         msg  = ['a,3,True', 'b,-1,False']
@@ -898,6 +913,12 @@ def test_delimited_to_arrays_quotechar_a(self) -> None:
         with self.assertRaises(TypeError):
             _ = delimited_to_arrays(msg, axis=1, quoting=csv.QUOTE_ALL, quotechar='foo')
 
+        with self.assertRaises(TypeError):
+            _ = delimited_to_arrays(msg, axis=1, quoting=csv.QUOTE_ALL, quotechar=None)
+
+        _ = delimited_to_arrays(msg, axis=1, quoting=csv.QUOTE_NONE, quotechar=None)
+
+
     def test_delimited_to_arrays_quotechar_b(self) -> None:
         msg  = ['|foo|,|3|,|True|', '|bar|,|-1|,|False|']
         post1 = delimited_to_arrays(msg, axis=1)