[cdd/{shared/ast_utils.py,sqlalchemy/utils/emit_utils.py}] Fix Python…

… 3.6 support ; correct keyword args
offscale · Feb 6, 2024 · 0e8ffa0 · 0e8ffa0
1 parent c217e56
commit 0e8ffa0
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 6 deletions.
diff --git a/cdd/shared/ast_utils.py b/cdd/shared/ast_utils.py
@@ -2040,7 +2040,17 @@ def optimise_imports(imports):
         ImportFrom(
             module=module_name,
             level=sym[0].level,
-            names=list(map(lambda al: alias(name=al.name, asname=al.asname), sym[1])),
+            names=list(
+                map(
+                    lambda al: alias(
+                        name=al.name,
+                        asname=al.asname,
+                        identifier=None,
+                        identifier_name=None,
+                    ),
+                    sym[1],
+                )
+            ),
         )
         for module_name, symbols in map(
             lambda key_group: (

diff --git a/cdd/sqlalchemy/utils/emit_utils.py b/cdd/sqlalchemy/utils/emit_utils.py
@@ -555,14 +555,37 @@ def generate_create_from_attr_staticmethod(params, cls_name, docstring_format):
 
 mock_engine_base_metadata_mod: Module = Module(
     body=[
-        ImportFrom(module="os", names=[alias(name="environ")], level=0),
+        ImportFrom(
+            module="os",
+            names=[
+                alias(
+                    "environ",
+                    None,
+                    identifier=None,
+                    identifier_name=None,
+                )
+            ],
+            level=0,
+        ),
         ImportFrom(
             module="sqlalchemy",
-            names=[alias(name="MetaData"), alias(name="create_engine")],
+            names=[
+                alias("MetaData", None, identifier=None, identifier_name=None),
+                alias("create_engine", None, identifier=None, identifier_name=None),
+            ],
             level=0,
         ),
         ImportFrom(
-            module="sqlalchemy.orm", names=[alias(name="DeclarativeBase")], level=0
+            module="sqlalchemy.orm",
+            names=[
+                alias(
+                    "DeclarativeBase",
+                    None,
+                    identifier=None,
+                    identifier_name=None,
+                )
+            ],
+            level=0,
         ),
         Assign(
             targets=[Name("engine", Store(), lineno=None, col_offset=None)],
@@ -598,7 +621,7 @@ def generate_create_from_attr_staticmethod(params, cls_name, docstring_format):
             keywords=[],
             body=[
                 Assign(
-                    targets=[Name("metadata", ctx=Store())],
+                    targets=[Name("metadata", Store(), lineno=None, col_offset=None)],
                     value=Name("metadata", Load(), lineno=None, col_offset=None),
                     expr=None,
                     lineno=None,
@@ -613,7 +636,7 @@ def generate_create_from_attr_staticmethod(params, cls_name, docstring_format):
             col_offset=None,
         ),
         Assign(
-            targets=[Name("__all__", ctx=Store())],
+            targets=[Name("__all__", Store(), lineno=None, col_offset=None)],
             value=AST_List(
                 elts=list(map(set_value, ("Base", "metadata", "engine"))),
                 ctx=Load(),