varname 0.13.2__py3-none-any.whl → 0.13.4__py3-none-any.whl

varname/__init__.py

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

varname/core.py

@@ -291,6 +291,11 @@ def nameof(
         VarnameRetrievingError: When the callee's node cannot be retrieved or
             trying to retrieve the full name of non attribute series calls.
     """
+    warnings.warn(
+        "`nameof` is deprecated and will be removed in the future. "
+        "Please use `argname` instead.",
+        DeprecationWarning,
+    )
     # Frame is anyway used in get_node
     frameobj = IgnoreList.create(
         ignore_lambda=False,

varname/helpers.py

@@ -153,7 +153,12 @@ class Wrapper:
         )
 
 
-def jsobj(*args: Any, vars_only: bool = True, **kwargs: Any) -> Dict[str, Any]:
+def jsobj(
+    *args: Any,
+    vars_only: bool = True,
+    frame: int = 1,
+    **kwargs: Any,
+) -> Dict[str, Any]:
     """A wrapper to create a JavaScript-like object
 
     When an argument is passed as positional argument, the name of the variable
@@ -171,13 +176,19 @@ def jsobj(*args: Any, vars_only: bool = True, **kwargs: Any) -> Dict[str, Any]:
 
     Args:
         *args: The positional arguments
-        **kwargs: The keyword arguments
         vars_only: Whether to only include variables in the output
+        frame: The call stack index. You can understand this as the number of
+            wrappers around this function - 1.
+        **kwargs: The keyword arguments
 
     Returns:
         A dict-like object
     """
-    argnames: Tuple[str, ...] = argname("args", vars_only=vars_only)  # type: ignore
+    argnames: Tuple[str, ...] = argname(
+        "args",
+        vars_only=vars_only,
+        frame=frame,
+    )  # type: ignore
     out = dict(zip(argnames, args))
     out.update(kwargs)
     return out

varname/utils.py

@@ -74,6 +74,7 @@ else:  # pragma: no cover
     ASSIGN_TYPES = (ast.Assign, ast.AnnAssign)
     AssignType = Union[ASSIGN_TYPES]  # type: ignore
 
+PY311 = sys.version_info >= (3, 11)
 MODULE_IGNORE_ID_NAME = "__varname_ignore_id__"
 
 
@@ -281,6 +282,7 @@ def bytecode_nameof(code: CodeType, offset: int) -> str:
         "CALL_FUNCTION",
         "CALL_METHOD",
         "CALL",
+        "CALL_KW",
     ):
         raise VarnameRetrievingError("Did you call 'nameof' in a weird way?")
 
@@ -290,7 +292,7 @@ def bytecode_nameof(code: CodeType, offset: int) -> str:
         current_instruction_index -= 1
         name_instruction = instructions[current_instruction_index]
 
-    if name_instruction.opname == "KW_NAMES":  # pragma: no cover
+    if name_instruction.opname in ("KW_NAMES", "LOAD_CONST"):  # LOAD_CONST python 3.13
         raise pos_only_error
 
     if not name_instruction.opname.startswith("LOAD_"):
@@ -533,22 +535,38 @@ def _(node: Union[ast.Attribute, ast.Subscript]) -> ast.Call:
 
     # x[1], x.a
     if isinstance(node.ctx, ast.Load):
-        return ast.Call(
-            func=ast.Attribute(
-                value=node.value,
-                attr=(
-                    "__getitem__"
-                    if isinstance(node, ast.Subscript)
-                    else "__getattr__"
+        if PY311:
+            return ast.Call(
+                func=ast.Attribute(
+                    value=node.value,
+                    attr=(
+                        "__getitem__"
+                        if isinstance(node, ast.Subscript)
+                        else "__getattr__"
+                    ),
+                    ctx=ast.Load(),
+                    **nodemeta,
                 ),
-                ctx=ast.Load(),
-                **nodemeta,
-            ),
-            args=[keynode],
-            keywords=[],
-            starargs=None,
-            kwargs=None,
-        )
+                args=[keynode],
+                keywords=[],
+            )
+        else:
+            return ast.Call(  # type: ignore
+                func=ast.Attribute(
+                    value=node.value,
+                    attr=(
+                        "__getitem__"
+                        if isinstance(node, ast.Subscript)
+                        else "__getattr__"
+                    ),
+                    ctx=ast.Load(),
+                    **nodemeta,
+                ),
+                args=[keynode],
+                keywords=[],
+                starargs=None,
+                kwargs=None,
+            )
 
     # x[a] = b, x.a = b
     if (
@@ -564,22 +582,38 @@ def _(node: Union[ast.Attribute, ast.Subscript]) -> ast.Call:
             )
         )
 
-    return ast.Call(
-        func=ast.Attribute(
-            value=node.value,
-            attr=(
-                "__setitem__"
-                if isinstance(node, ast.Subscript)
-                else "__setattr__"
+    if PY311:
+        return ast.Call(
+            func=ast.Attribute(
+                value=node.value,
+                attr=(
+                    "__setitem__"
+                    if isinstance(node, ast.Subscript)
+                    else "__setattr__"
+                ),
+                ctx=ast.Load(),
+                **nodemeta,
             ),
-            ctx=ast.Load(),
-            **nodemeta,
-        ),
-        args=[keynode, node.parent.value],  # type: ignore
-        keywords=[],
-        starargs=None,
-        kwargs=None,
-    )
+            args=[keynode, node.parent.value],  # type: ignore
+            keywords=[],
+        )
+    else:
+        return ast.Call(
+            func=ast.Attribute(
+                value=node.value,
+                attr=(
+                    "__setitem__"
+                    if isinstance(node, ast.Subscript)
+                    else "__setattr__"
+                ),
+                ctx=ast.Load(),
+                **nodemeta,
+            ),
+            args=[keynode, node.parent.value],  # type: ignore
+            keywords=[],
+            starargs=None,
+            kwargs=None,
+        )
 
 
 @reconstruct_func_node.register(ast.Compare)
@@ -593,18 +627,30 @@ def _(node: ast.Compare) -> ast.Call:
         "lineno": node.lineno,
         "col_offset": node.col_offset,
     }
-    return ast.Call(
-        func=ast.Attribute(
-            value=node.left,
-            attr=CMP2MAGIC[type(node.ops[0])],
-            ctx=ast.Load(),
-            **nodemeta,
-        ),
-        args=[node.comparators[0]],
-        keywords=[],
-        starargs=None,
-        kwargs=None,
-    )
+    if PY311:
+        return ast.Call(
+            func=ast.Attribute(
+                value=node.left,
+                attr=CMP2MAGIC[type(node.ops[0])],
+                ctx=ast.Load(),
+                **nodemeta,
+            ),
+            args=[node.comparators[0]],
+            keywords=[],
+        )
+    else:
+        return ast.Call(  # type: ignore
+            func=ast.Attribute(
+                value=node.left,
+                attr=CMP2MAGIC[type(node.ops[0])],
+                ctx=ast.Load(),
+                **nodemeta,
+            ),
+            args=[node.comparators[0]],
+            keywords=[],
+            starargs=None,
+            kwargs=None,
+        )
 
 
 @reconstruct_func_node.register(ast.BinOp)
@@ -614,18 +660,31 @@ def _(node: ast.BinOp) -> ast.Call:
         "lineno": node.lineno,
         "col_offset": node.col_offset,
     }
-    return ast.Call(
-        func=ast.Attribute(
-            value=node.left,
-            attr=OP2MAGIC[type(node.op)],
-            ctx=ast.Load(),
-            **nodemeta,
-        ),
-        args=[node.right],
-        keywords=[],
-        starargs=None,
-        kwargs=None,
-    )
+
+    if PY311:
+        return ast.Call(
+            func=ast.Attribute(
+                value=node.left,
+                attr=OP2MAGIC[type(node.op)],
+                ctx=ast.Load(),
+                **nodemeta,
+            ),
+            args=[node.right],
+            keywords=[],
+        )
+    else:
+        return ast.Call(  # type: ignore
+            func=ast.Attribute(
+                value=node.left,
+                attr=OP2MAGIC[type(node.op)],
+                ctx=ast.Load(),
+                **nodemeta,
+            ),
+            args=[node.right],
+            keywords=[],
+            starargs=None,
+            kwargs=None,
+        )
 
 
 def rich_exc_message(msg: str, node: ast.AST, context_lines: int = 4) -> str:

{varname-0.13.2.dist-info → varname-0.13.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: varname
-Version: 0.13.2
+Version: 0.13.4
 Summary: Dark magics about variable names in python.
 Home-page: https://github.com/pwwang/python-varname
 License: MIT

varname-0.13.4.dist-info/RECORD

@@ -0,0 +1,10 @@
+varname/__init__.py,sha256=Kwx6Bac3gQwx6y-nL8tmkBXotCWDefqnktF_uc3tyVs,369
+varname/core.py,sha256=HKcvZAIq6gQQlzuBgUsqeM0USZFDJ8pkYdQC9z8uJjs,19474
+varname/helpers.py,sha256=jZaP-qWQJwi8T2f886eHOj-llXAPHk5SMU6PfVn-9dg,9558
+varname/ignore.py,sha256=-VC3oqag44y2UlAw0ErYKHotx616qJL3Sjb_5y7Tw1c,14400
+varname/py.typed,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+varname/utils.py,sha256=JCOGoLEXq3mQvQeobEyGiP4N2y1_42ULjwPvDn5SNSo,22882
+varname-0.13.4.dist-info/LICENSE,sha256=3bS8O2tMbBPz8rWmZBAOzkHQjcK-b7KwFHyyghEZ-Ak,1063
+varname-0.13.4.dist-info/METADATA,sha256=PUOgy7_nnnqyVZvE64E97P5IqHYlMVdeyCoCrIhEWCI,12845
+varname-0.13.4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+varname-0.13.4.dist-info/RECORD,,

varname-0.13.2.dist-info/RECORD

@@ -1,10 +0,0 @@
-varname/__init__.py,sha256=5liGcc8MtbaaXusFuboC3Xf5rNHQv02YRqvNgd8HX10,369
-varname/core.py,sha256=nntOVpiavXP0EXijTNF6xIe4mxvz_FRpBjrL9z_JHJ0,19311
-varname/helpers.py,sha256=x52Fmxx7p9PMa3BFFXRD_zapoeBG0WVVU8S5hnHPh60,9354
-varname/ignore.py,sha256=-VC3oqag44y2UlAw0ErYKHotx616qJL3Sjb_5y7Tw1c,14400
-varname/py.typed,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-varname/utils.py,sha256=ByHbUjbdMlHHckW4y77Jr_DHhkSmk8TabTy3INDJWsY,20971
-varname-0.13.2.dist-info/LICENSE,sha256=3bS8O2tMbBPz8rWmZBAOzkHQjcK-b7KwFHyyghEZ-Ak,1063
-varname-0.13.2.dist-info/METADATA,sha256=0LgE9BiDPKtkAeDy7VQGx1DSZyWtzRQdA7gCc_CWHv0,12845
-varname-0.13.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-varname-0.13.2.dist-info/RECORD,,