Merge pull request #61 from martinkilbinger/shlex

string split with quoted strings

Author: martinkilbinger

cs_util/args.py

@@ -9,6 +9,7 @@
 
 import sys
 import os
+import shlex
 
 from optparse import OptionParser
 
@@ -103,6 +104,9 @@ def my_string_split(string, num=-1, verbose=False, stop=False, sep=None):
     the first in the list [space, underscore] that occurs in the string.
     (Thus, if both occur, use space.)
 
+    Handles quoted strings: entries containing spaces can be enclosed
+    in double quotes, e.g., 'value1 "entry with spaces" value3'.
+
     Parameters
     ----------
     string : str
@@ -131,6 +135,19 @@ def my_string_split(string, num=-1, verbose=False, stop=False, sep=None):
     if string is None:
         return None
 
+    # Handle quoted strings with shlex
+    if '"' in string or "'" in string:
+        try:
+            res = shlex.split(string)
+            if num != -1 and num != len(res) and stop:
+                raise ValueError(
+                    f"String has {len(res)} elements, required is {num}"
+                )
+            return res
+        except ValueError:
+            # Fall through to regular splitting if shlex fails
+            pass
+
     if sep is None:
         has_space = string.find(" ")
         has_underscore = string.find("_")
@@ -162,7 +179,7 @@ def my_string_split(string, num=-1, verbose=False, stop=False, sep=None):
 
     if num != -1 and num != len(res) and stop:
         raise ValueError(
-            f"String '{len(res)}' has length {num}, required is {num}"
+            f"String has {len(res)} elements, required is {num}"
         )
 
     return res

cs_util/cat.py

@@ -253,11 +253,11 @@ def read_dndz(file_path):
 
     Returns
     -------
-    np.array :
+    np.array
         redshift bin centers
-    np.array :
+    np.array
         number densities
-    np.array :
+    np.array
         redshift bin edges; one less than centers and density arrays
 
     """

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cs_util"
-version = "0.1.8"
+version = "0.1.9"
 description = "Utility library for CosmoStat"
 authors = [
 	{ name = "Martin Kilbinger", email = "martin.kilbinger@cea.fr" },