py2ls 0.1.8.3__py3-none-any.whl → 0.1.8.4__py3-none-any.whl

py2ls/ips.py

@@ -457,13 +457,15 @@ def str2date(date_str, fmt="%Y-%m-%d_%H:%M:%S"):
 # print(str2)
 
 
-def str2num(s, *args):
-    delimiter = None
-    round_digits = None
+def str2num(s, *args, **kwargs):
+    delimiter = kwargs.get("sep", None)
+    round_digits = kwargs.get("round", None)
+    if delimiter is not None:
+        s = s.replace(delimiter, "")
     for arg in args:
-        if isinstance(arg, str):
+        if isinstance(arg, str) and delimiter is None:
             delimiter = arg
-        elif isinstance(arg, int):
+        elif isinstance(arg, int) and round_digits is None:
             round_digits = arg
     try:
         num = int(s)
@@ -491,17 +493,17 @@ def str2num(s, *args):
                             "Multiple number segments found, cannot determine single numeric value"
                         )
                 except Exception as e:
-                    raise ValueError(f"Cannot convert {s} to a number: {e}")
+                    return None
 
     # Apply rounding if specified
     if round_digits is not None:
         num_adj = num + 0.00000000001  # Ensure precise rounding
         num = round(num_adj, round_digits)
-
-    # Apply delimiter formatting if specified
-    if delimiter is not None:
-        num_str = f"{num:,}".replace(",", delimiter)
-        return num_str
+    if round_digits == 0:
+        num = int(num)
+    # if delimiter is not None:
+    #     num_str = f"{num:,}".replace(",", delimiter)
+    #     return num_str#s.replace(delimiter, "")
 
     return num
 
@@ -516,9 +518,9 @@ def str2num(s, *args):
 # print(str2num("12345.6789", " ", 2)) # Output: 12 345.68
 # print(str2num('111113.34555',3,',')) # Output: 111,113.346
 # print(str2num("123.55555 sec miniuets",3)) # Output: 1.3
-def num2str(num, *args):
-    delimiter = None
-    round_digits = None
+def num2str(num, *args, **kwargs):
+    delimiter = kwargs.get("sep", None)
+    round_digits = kwargs.get("round", None)
 
     # Parse additional arguments
     for arg in args:

{py2ls-0.1.8.3.dist-info → py2ls-0.1.8.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py2ls
-Version: 0.1.8.3
+Version: 0.1.8.4
 Summary: py(thon)2(too)ls
 Author: Jianfeng
 Author-email: Jianfeng.Liu0413@gmail.com

{py2ls-0.1.8.3.dist-info → py2ls-0.1.8.4.dist-info}/RECORD

@@ -134,7 +134,7 @@ py2ls/db2ls.py,sha256=MMfFX47aIPIyu7fU9aPvX9lbPRPYOpJ_VXwlnWk-8qo,13615
 py2ls/doc.py,sha256=xN3g1OWfoaGUhikbJ0NqbN5eKy1VZVvWwRlhHMgyVEc,4243
 py2ls/export_requirements.py,sha256=x2WgUF0jYKz9GfA1MVKN-MdsM-oQ8yUeC6Ua8oCymio,2325
 py2ls/freqanalysis.py,sha256=F4218VSPbgL5tnngh6xNCYuNnfR-F_QjECUUxrPYZss,32594
-py2ls/ips.py,sha256=nGGA9Xqa5MzU5X7aE7Mfkk0qrnOkn3DGYulKuh-Ew48,100571
+py2ls/ips.py,sha256=mBFTARM6Pvj5EaVRR05CXCBlyNcbX2JfMQWBjnxONjI,100773
 py2ls/netfinder.py,sha256=MY_0TQY_zaRBZ6wfR4RxNCGrU93HFmDVDRRy1EXl75o,47566
 py2ls/plot.py,sha256=WIAUDd4cRjFTX_Y_SWwsSw9_gIQF_Ye6R_-MvhB9G1k,50437
 py2ls/setuptools-70.1.0-py3-none-any.whl,sha256=2bi3cUVal8ip86s0SOvgspteEF8SKLukECi-EWmFomc,882588
@@ -142,6 +142,6 @@ py2ls/sleep_events_detectors.py,sha256=bQA3HJqv5qnYKJJEIhCyhlDtkXQfIzqksnD0YRXso
 py2ls/stats.py,sha256=Wd9yCKQ_61QD29WMEgMuEcreFxF91NmlPW65iWT2B5w,39041
 py2ls/translator.py,sha256=bc5FB-wqC4TtQz9gyCP1mE38HqNRJ_pmuRIgKnAlMzM,30581
 py2ls/wb_detector.py,sha256=7y6TmBUj9exCZeIgBAJ_9hwuhkDh1x_-yg4dvNY1_GQ,6284
-py2ls-0.1.8.3.dist-info/METADATA,sha256=-paqLVPq6PniDxsUdZ0UVwJQIry2DrS958ohish7h2o,20017
-py2ls-0.1.8.3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-py2ls-0.1.8.3.dist-info/RECORD,,
+py2ls-0.1.8.4.dist-info/METADATA,sha256=ieFZ6Fgi3Tw6gIm1kdxkpLbk3XMgEwJ7uUIZTjSr-eo,20017
+py2ls-0.1.8.4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+py2ls-0.1.8.4.dist-info/RECORD,,