Fix deprecations (#106)

Author: JelleZijlstra

README.rst

@@ -81,6 +81,10 @@ call ``resolver.get_fully_qualified_name('collections.Set')`` to retrieve the
 Changelog
 ---------
 
+Unreleased
+
+- Fix warnings due to use of deprecated AST classes
+
 Version 2.5.1 (February 25, 2024)
 
 - Fix packaging metadata that still incorrectly declared support for Python 3.7

tests/test.py

@@ -334,7 +334,7 @@ class IntegrationTest(unittest.TestCase):
     def test(self) -> None:
         ctx = get_search_context(raise_on_warnings=True)
         for module_name, module_path in typeshed_client.get_all_stub_files(ctx):
-            with self.subTest(path=module_name):
+            with self.subTest(name=module_name, path=module_path):
                 try:
                     ast = typeshed_client.get_stub_ast(module_name, search_context=ctx)
                 except SyntaxError:

typeshed_client/parser.py

@@ -153,9 +153,9 @@ def _get_dunder_all_from_ast(node: ast.AST) -> Optional[List[str]]:
         raise InvalidStub(f"Invalid __all__: {ast.dump(rhs)}")
     names = []
     for elt in rhs.elts:
-        if not isinstance(elt, ast.Str):
+        if not isinstance(elt, ast.Constant) or not isinstance(elt.value, str):
             raise InvalidStub(f"Invalid __all__: {ast.dump(rhs)}")
-        names.append(elt.s)
+        names.append(elt.value)
     return names
 
 
@@ -313,7 +313,9 @@ def visit_ImportFrom(self, node: ast.ImportFrom) -> Iterable[NameInfo]:
                 )
 
     def visit_Expr(self, node: ast.Expr) -> Iterable[NameInfo]:
-        if isinstance(node.value, (ast.Ellipsis, ast.Str)):
+        if isinstance(node.value, ast.Constant) and (
+            node.value.value is Ellipsis or isinstance(node.value.value, str)
+        ):
             return
         dunder_all = self._maybe_extract_dunder_all(node.value)
         if dunder_all is not None: