symbex 0.3__tar.gz → 0.3.2__tar.gz

{symbex-0.3/symbex.egg-info → symbex-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: symbex
-Version: 0.3
+Version: 0.3.2
 Summary: Find the Python code for specified symbols
 Home-page: https://github.com/simonw/symbex
 Author: Simon Willison
@@ -132,7 +132,7 @@ cog.out(
 # File: symbex/cli.py Line: 37
 def cli(symbols, files, directories, signatures, silent)
 
-# File: symbex/lib.py Line: 150
+# File: symbex/lib.py Line: 161
 def class_definition(class_def)
 
 # File: symbex/lib.py Line: 32

{symbex-0.3 → symbex-0.3.2}/README.md

@@ -117,7 +117,7 @@ cog.out(
 # File: symbex/cli.py Line: 37
 def cli(symbols, files, directories, signatures, silent)
 
-# File: symbex/lib.py Line: 150
+# File: symbex/lib.py Line: 161
 def class_definition(class_def)
 
 # File: symbex/lib.py Line: 32

{symbex-0.3 → symbex-0.3.2}/setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup
 import os
 
-VERSION = "0.3"
+VERSION = "0.3.2"
 
 
 def get_long_description():

{symbex-0.3 → symbex-0.3.2}/symbex/lib.py

@@ -1,5 +1,5 @@
 import fnmatch
-from ast import literal_eval, parse, AST, FunctionDef, ClassDef
+from ast import literal_eval, parse, AST, AsyncFunctionDef, FunctionDef, ClassDef
 from itertools import zip_longest
 import textwrap
 from typing import Iterable, List, Optional, Tuple
@@ -13,7 +13,7 @@ def find_symbol_nodes(
     matches = []
     module = parse(code)
     for node in module.body:
-        if not isinstance(node, (ClassDef, FunctionDef)):
+        if not isinstance(node, (ClassDef, FunctionDef, AsyncFunctionDef)):
             continue
         name = getattr(node, "name", None)
         if match(name, symbols):
@@ -21,7 +21,7 @@ def find_symbol_nodes(
         # If it's a class search its methods too
         if isinstance(node, ClassDef):
             for child in node.body:
-                if isinstance(child, FunctionDef):
+                if isinstance(child, (FunctionDef, AsyncFunctionDef)):
                     qualified_name = f"{name}.{child.name}"
                     if match(qualified_name, symbols):
                         matches.append((child, name))
@@ -37,7 +37,7 @@ def code_for_node(
     start = None
     end = None
     if signatures:
-        if isinstance(node, FunctionDef):
+        if isinstance(node, (FunctionDef, AsyncFunctionDef)):
             definition, lineno = function_definition(node), node.lineno
             if class_name:
                 definition = "    " + definition
@@ -109,7 +109,14 @@ def function_definition(function_node: AST):
     # if defaults has 2 and args has 3 then those
     # defaults correspond to the last two args
     defaults = [None] * (len(all_args) - len(function_node.args.defaults))
-    defaults.extend(literal_eval(default) for default in function_node.args.defaults)
+    for default in function_node.args.defaults:
+        try:
+            value = literal_eval(default)
+            if isinstance(value, str):
+                value = f'"{value}"'
+        except ValueError:
+            value = getattr(default, "id", "...")
+        defaults.append(value)
 
     arguments = []
 
@@ -144,7 +151,11 @@ def function_definition(function_node: AST):
             # None shows as returns.value is None
             return_annotation = " -> None"
 
-    return f"def {function_name}({arguments_str}){return_annotation}"
+    def_ = "def "
+    if isinstance(function_node, AsyncFunctionDef):
+        def_ = "async def "
+
+    return f"{def_}{function_name}({arguments_str}){return_annotation}"
 
 
 def class_definition(class_def):

{symbex-0.3 → symbex-0.3.2/symbex.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: symbex
-Version: 0.3
+Version: 0.3.2
 Summary: Find the Python code for specified symbols
 Home-page: https://github.com/simonw/symbex
 Author: Simon Willison
@@ -132,7 +132,7 @@ cog.out(
 # File: symbex/cli.py Line: 37
 def cli(symbols, files, directories, signatures, silent)
 
-# File: symbex/lib.py Line: 150
+# File: symbex/lib.py Line: 161
 def class_definition(class_def)
 
 # File: symbex/lib.py Line: 32

{symbex-0.3 → symbex-0.3.2}/tests/test_symbex.py

@@ -11,7 +11,7 @@ def directory_full_of_code(tmpdir):
     for path, content in (
         ("foo.py", "def foo1():\n    pass\n\n@decorated\ndef foo2():\n    pass\n\n"),
         ("bar.py", "class BarClass:\n    pass\n\n"),
-        ("nested/baz.py", "def baz():\n    pass\n\n"),
+        ("nested/baz.py", 'def baz(delimiter=", ", type=str):\n    pass\n\n'),
         ("nested/error.py", "def baz_error()" + "bug:\n    pass\n\n"),
         (
             "methods.py",
@@ -26,6 +26,19 @@ def directory_full_of_code(tmpdir):
         """
             ),
         ),
+        (
+            "async.py",
+            textwrap.dedent(
+                """
+            async def async_func(a, b, c):
+                pass
+
+            class MyAsyncClass:
+                async def async_method(a, b, c):
+                    pass
+            """
+            ).strip(),
+        ),
     ):
         p = pathlib.Path(tmpdir / path)
         p.parent.mkdir(parents=True, exist_ok=True)
@@ -47,17 +60,21 @@ def directory_full_of_code(tmpdir):
         ),
         (
             ["baz", "--silent"],
-            "# File: nested/baz.py Line: 1\ndef baz():\n    pass\n\n",
+            '# File: nested/baz.py Line: 1\ndef baz(delimiter=", ", type=str):\n    pass\n\n',
+        ),
+        (
+            ["async_func", "--silent"],
+            "# File: async.py Line: 1\nasync def async_func(a, b, c):\n    pass\n\n",
         ),
         # The -f option
         (
             ["baz", "-f", "nested/baz.py", "--silent"],
-            "# File: nested/baz.py Line: 1\ndef baz():\n    pass\n\n",
+            '# File: nested/baz.py Line: 1\ndef baz(delimiter=", ", type=str):\n    pass\n\n',
         ),
         # The -d option
         (
             ["baz", "-d", "nested", "--silent"],
-            "# File: nested/baz.py Line: 1\ndef baz():\n    pass\n\n",
+            '# File: nested/baz.py Line: 1\ndef baz(delimiter=", ", type=str):\n    pass\n\n',
         ),
         # Classes
         (
@@ -96,6 +113,15 @@ def directory_full_of_code(tmpdir):
             "        pass\n"
             "\n",
         ),
+        (
+            ["*.async_method", "--silent"],
+            (
+                "# File: async.py Class: MyAsyncClass Line: 5\n"
+                "    async def async_method(a, b, c):\n"
+                "        pass\n"
+                "\n"
+            ),
+        ),
     ),
 )
 def test_fixture(directory_full_of_code, monkeypatch, args, expected):
@@ -118,7 +144,10 @@ def test_fixture(directory_full_of_code, monkeypatch, args, expected):
             "def foo2()",
         ),
         (["BarClass", "--silent"], "# File: bar.py Line: 1\n" "class BarClass"),
-        (["baz", "--silent"], ("# File: nested/baz.py Line: 1\n" "def baz()")),
+        (
+            ["baz", "--silent"],
+            ("# File: nested/baz.py Line: 1\n" 'def baz(delimiter=", ", type=str)'),
+        ),
     ),
 )
 def test_symbex_symbols(directory_full_of_code, monkeypatch, args, expected):
@@ -136,8 +165,11 @@ def test_errors(directory_full_of_code, monkeypatch):
     monkeypatch.chdir(directory_full_of_code)
     result = runner.invoke(cli, ["baz"], catch_exceptions=False)
     assert result.exit_code == 0
-    assert result.stdout == (
-        "# File: nested/baz.py Line: 1\n" "def baz():\n" "    pass\n\n"
+    expected = (
+        "# File: nested/baz.py Line: 1\n"
+        'def baz(delimiter=", ", type=str):\n'
+        "    pass\n\n"
     )
+    assert result.stdout == expected
     # This differs between different Python versions
     assert result.stderr.startswith("# Syntax error in nested/error.py:")

{symbex-0.3 → symbex-0.3.2}/tests/test_symbols.py

@@ -20,6 +20,7 @@ def symbols_text():
     (
         ("func_no_args", "def func_no_args()"),
         ("func_positional_args", "def func_positional_args(a, b, c)"),
+        ("async_func", "async def async_func(a, b, c)"),
         ("func_default_args", "def func_default_args(a, b=2, c=3)"),
         ("func_arbitrary_positional_args", "def func_arbitrary_positional_args(*args)"),
         ("func_arbitrary_keyword_args", "def func_arbitrary_keyword_args(**kwargs)"),
@@ -45,3 +46,20 @@ def test_symbols(name, expected, symbols_text):
     )
     # Special case to ensure we don't get ClassNoBase()
     assert "ClassNoBase()" not in symbols_text
+
+
+def test_method_symbols():
+    runner = CliRunner()
+    args = [
+        "*.async*",
+        "-s",
+        "-f",
+        str(pathlib.Path(__file__).parent / "example_symbols.py"),
+    ]
+    result = runner.invoke(cli, args, catch_exceptions=False)
+    assert result.exit_code == 0
+    assert result.stdout == (
+        "# File: tests/example_symbols.py Class: ClassWithMethods Line: 88\n"
+        "    async def async_method(a, b, c)\n"
+        "\n"
+    )