reykit 1.1.30__py3-none-any.whl → 1.1.32__py3-none-any.whl

reykit/rbase.py

@@ -20,7 +20,7 @@ from traceback import format_stack, extract_stack
 from atexit import register as atexit_register
 from time import sleep as time_sleep
 from inspect import signature as inspect_signature, _ParameterKind, _empty
-from ast import Starred
+from ast import AST, Name, Attribute, Call, Starred, keyword, dump as ast_dump
 from varname import VarnameException, argname as varname_argname
 
 
@@ -56,6 +56,7 @@ __all__ = (
     'get_stack_text',
     'get_stack_param',
     'get_arg_info',
+    'get_astname',
     'get_varname',
     'block',
     'at_exit'
@@ -860,6 +861,39 @@ def get_arg_info(func: Callable) -> list[
     return info
 
 
+def get_astname(obj: AST) -> str:
+    """
+    Get object mapping name of `ast` package.
+
+    Parameters
+    ----------
+    obj : `AST` object.
+
+    Returns
+    -------
+    Mapping name.
+    """
+
+    # Get.
+    match obj:
+        case Name():
+            name = obj.id
+        case Attribute():
+            name = obj.attr
+        case Call():
+            name = obj.func
+        case Starred() | keyword():
+            name = obj.value
+        case _:
+            name = ast_dump(obj)
+
+    # Again.
+    if type(name) != str:
+        name = get_astname(name)
+
+    return name
+
+
 def get_varname(argname: str, level: int = 1) -> str | list[str] | None:
     """
     Get variable name of function input argument, can backtrack.
@@ -883,24 +917,21 @@ def get_varname(argname: str, level: int = 1) -> str | list[str] | None:
 
     # Get.
     try:
-        result = varname_argname(argname, frame=level)
+        varnames: str | AST | tuple[str | AST, ...] = varname_argname(argname, frame=level)
     except VarnameException:
         return
 
-    # Convert.
-    if type(result) != tuple:
-        result = (result,)
-    varnames: list[str] = [
-        name
-        for elem in result
-        for name in (
-            (elem.value.id,)
-            if type(elem) == Starred
-            else tuple(elem.values())
-            if type(elem) == dict
-            else (elem,)
-        )
-    ]
+    # Handle type AST.
+    if type(varnames) == tuple:
+        varnames = [
+            get_astname(varname)
+            if type(varnames) != str
+            else varname
+            for varname in varnames
+        ]
+    else:
+        if type(varnames) != str:
+            varnames = get_astname(varnames)
 
     return varnames
 

{reykit-1.1.30.dist-info → reykit-1.1.32.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: reykit
-Version: 1.1.30
+Version: 1.1.32
 Summary: Kit method set.
 Project-URL: homepage, https://github.com/reyxbo/reykit/
 Author-email: Rey <reyxbo@163.com>

{reykit-1.1.30.dist-info → reykit-1.1.32.dist-info}/RECORD

@@ -1,6 +1,6 @@
 reykit/__init__.py,sha256=V86CHqPAAVkooVx3_QIOKpDIFVneQCTTSwfJ-uWgBno,788
 reykit/rall.py,sha256=7Hip02YOkIDm3_xkoSDjvvYV2LhdBV2r4UKzWWnIfIo,628
-reykit/rbase.py,sha256=MluWXVrai98DMlhNrYLvpEZkxl4F683cRBHS8osKiGw,22306
+reykit/rbase.py,sha256=6hYy_IGUuogIvTrN4p7adaElLuoYvLL80dMFSySqmGo,22990
 reykit/rdata.py,sha256=COe2VVGaUV0L1MD6PB7zL8treVNehVFqJELbm7wAvs0,9471
 reykit/remail.py,sha256=s7TXbLgEWEqNoeM42c6FpPufB2LajHgQuahfZri3urQ,6706
 reykit/rimage.py,sha256=p7caatLE71yy7GUTkTKyMOaJTeBfl6pZr_7BFjcDvY8,6159
@@ -22,7 +22,7 @@ reykit/rwrap.py,sha256=RK3wlc2cd-lnAvzqzvKsS21EtCmBNTA3i8HRbaolWE4,15275
 reykit/rzip.py,sha256=ABUDLwEHQIpcvZbJE_oV78H7dik6nC7kaRz660Ro9Os,3481
 reykit/rdll/__init__.py,sha256=tdKb-BOKLFn-diCvXjSLg9x71VuRKzkg2KtpOLGLTR4,679
 reykit/rdll/rdll_core.py,sha256=o6-rKcTQgxZQe0kD3GnwyNb3KL9IogzgCQNOmYLMm7A,5086
-reykit-1.1.30.dist-info/METADATA,sha256=JWb4r7Ug9idWje8YkEezX8kIIkqH9GjNhgRptrI0VAw,1913
-reykit-1.1.30.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reykit-1.1.30.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reykit-1.1.30.dist-info/RECORD,,
+reykit-1.1.32.dist-info/METADATA,sha256=6oIOTt0_vB0G9wd-8QQ4ne0_MUXD6gPYZGpBTTSZuME,1913
+reykit-1.1.32.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reykit-1.1.32.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reykit-1.1.32.dist-info/RECORD,,