varname 0.12.2__py3-none-any.whl → 0.13.0__py3-none-any.whl

varname/__init__.py

@@ -13,4 +13,4 @@ from .utils import (
 )
 from .core import varname, nameof, will, argname
 
-__version__ = "0.12.2"
+__version__ = "0.13.0"

varname/utils.py

@@ -185,7 +185,10 @@ def lookfor_parent_assign(node: ast.AST, strict: bool = True) -> AssignType:
     return None
 
 
-def node_name(node: ast.AST) -> Union[str, Tuple[Union[str, Tuple], ...]]:
+def node_name(
+    node: ast.AST,
+    subscript_slice: bool = False,
+) -> Union[str, Tuple[Union[str, Tuple], ...]]:
     """Get the node node name.
 
     Raises ImproperUseError when failed
@@ -193,15 +196,50 @@ def node_name(node: ast.AST) -> Union[str, Tuple[Union[str, Tuple], ...]]:
     if isinstance(node, ast.Name):
         return node.id
     if isinstance(node, ast.Attribute):
-        return node.attr
-    if isinstance(node, (ast.List, ast.Tuple)):
+        return f"{node_name(node.value)}.{node.attr}"
+    if isinstance(node, ast.Constant):
+        return repr(node.value)
+    if isinstance(node, (ast.List, ast.Tuple)) and not subscript_slice:
         return tuple(node_name(elem) for elem in node.elts)
+    if isinstance(node, ast.List):
+        return f"[{', '.join(node_name(elem) for elem in node.elts)}]"  # type: ignore
+    if isinstance(node, ast.Tuple):
+        if len(node.elts) == 1:
+            return f"({node_name(node.elts[0])},)"
+        return f"({', '.join(node_name(elem) for elem in node.elts)})"  # type: ignore
     if isinstance(node, ast.Starred):
         return f"*{node_name(node.value)}"
+    if isinstance(node, ast.Slice):
+        return (
+            f"{node_name(node.lower)}:{node_name(node.upper)}:{node_name(node.step)}"
+            if node.lower is not None
+            and node.upper is not None
+            and node.step is not None
+            else f"{node_name(node.lower)}:{node_name(node.upper)}"
+            if node.lower is not None and node.upper is not None
+            else f"{node_name(node.lower)}:"
+            if node.lower is not None
+            else f":{node_name(node.upper)}"
+            if node.upper is not None
+            else ":"
+        )
+
+    name = type(node).__name__
+    if isinstance(node, ast.Subscript):
+        try:
+            return f"{node_name(node.value)}[{node_name(node.slice, True)}]"
+        except ImproperUseError:
+            name = f"{node_name(node.value)}[{type(node.slice).__name__}]"
 
     raise ImproperUseError(
-        f"Can only get name of a variable or attribute, "
-        f"not {ast.dump(node)}"
+        f"Node {name!r} detected, but only following nodes are supported: \n"
+        "  - ast.Name (e.g. x)\n"
+        "  - ast.Attribute (e.g. x.y, x be other supported nodes)\n"
+        "  - ast.Constant (e.g. 1, 'a')\n"
+        "  - ast.List (e.g. [x, y, z])\n"
+        "  - ast.Tuple (e.g. (x, y, z))\n"
+        "  - ast.Starred (e.g. *x)\n"
+        "  - ast.Subscript with slice of the above nodes (e.g. x[y])"
     )
 
 

{varname-0.12.2.dist-info → varname-0.13.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: varname
-Version: 0.12.2
+Version: 0.13.0
 Summary: Dark magics about variable names in python.
 Home-page: https://github.com/pwwang/python-varname
 License: MIT
@@ -222,7 +222,7 @@ Special thanks to [@HanyuuLu][2] to give up the name `varname` in pypi for this
     func = function2()  # func == 'func'
 
     a = lambda: 0
-    a.b = function() # a.b == 'b'
+    a.b = function() # a.b == 'a.b'
     ```
 
 ### The decorator way to register `__varname__` to functions/classes

varname-0.13.0.dist-info/RECORD

@@ -0,0 +1,9 @@
+varname/__init__.py,sha256=UTuY7fG_AbLwpbhBnup66zRlEvl0WnG6exf5AvOyyp0,369
+varname/core.py,sha256=nntOVpiavXP0EXijTNF6xIe4mxvz_FRpBjrL9z_JHJ0,19311
+varname/helpers.py,sha256=ho5X2t3PiSYDexwpA4TO_l68VWh3HER7bsUKzcbiCNM,9242
+varname/ignore.py,sha256=-VC3oqag44y2UlAw0ErYKHotx616qJL3Sjb_5y7Tw1c,14400
+varname/utils.py,sha256=ByHbUjbdMlHHckW4y77Jr_DHhkSmk8TabTy3INDJWsY,20971
+varname-0.13.0.dist-info/LICENSE,sha256=3bS8O2tMbBPz8rWmZBAOzkHQjcK-b7KwFHyyghEZ-Ak,1063
+varname-0.13.0.dist-info/METADATA,sha256=6YjfqWLcmjJ9TXHN5yLlAn0DHrBg3escnFyzqLgKdWM,12580
+varname-0.13.0.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+varname-0.13.0.dist-info/RECORD,,

varname-0.12.2.dist-info/RECORD

@@ -1,9 +0,0 @@
-varname/__init__.py,sha256=_--tA4u7XQB0HB4dT3j_f52p-DL2rgwT2TyaOsvo0B0,369
-varname/core.py,sha256=nntOVpiavXP0EXijTNF6xIe4mxvz_FRpBjrL9z_JHJ0,19311
-varname/helpers.py,sha256=ho5X2t3PiSYDexwpA4TO_l68VWh3HER7bsUKzcbiCNM,9242
-varname/ignore.py,sha256=-VC3oqag44y2UlAw0ErYKHotx616qJL3Sjb_5y7Tw1c,14400
-varname/utils.py,sha256=f0dDRYfOeebdDvEwVSQVXNpHC1sB3-1qNE8mICg1IcE,19296
-varname-0.12.2.dist-info/LICENSE,sha256=3bS8O2tMbBPz8rWmZBAOzkHQjcK-b7KwFHyyghEZ-Ak,1063
-varname-0.12.2.dist-info/METADATA,sha256=JFiq7RcC9LJF2NZ__AQ5GYaIXMP9gTIyF2LoTv1Hsqg,12578
-varname-0.12.2.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-varname-0.12.2.dist-info/RECORD,,