From 5fb5ecf8d381184b24b9dbcc243259b79fdc04b5 Mon Sep 17 00:00:00 2001 From: nucccc Date: Wed, 15 Jul 2026 22:38:32 +0200 Subject: [PATCH] switched to collections.abc in favor of typing --- src/sqlmodelgen/codegen/cir_to_full_ast/code_ir_to_ast.py | 2 +- src/sqlmodelgen/codegen/cir_to_full_ast/to_ast_imports.py | 2 +- src/sqlmodelgen/codegen/code_ir/build_cir.py | 3 ++- src/sqlmodelgen/codegen/code_ir/build_col_attrs.py | 2 +- src/sqlmodelgen/codegen/code_ir/build_rels.py | 3 +-- src/sqlmodelgen/codegen/code_ir/build_table_args.py | 2 +- src/sqlmodelgen/codegen/code_ir/code_ir.py | 3 ++- src/sqlmodelgen/codegen/codegen.py | 2 +- src/sqlmodelgen/ir/mysql/__init__.py | 2 +- src/sqlmodelgen/ir/parse/ir_parse.py | 4 ++-- src/sqlmodelgen/ir/postgres/postgres_collect.py | 2 +- src/sqlmodelgen/ir/query/__init__.py | 3 ++- src/sqlmodelgen/sqlmodelgen.py | 2 +- tests/helpers/verify_helpers.py | 2 +- 14 files changed, 18 insertions(+), 16 deletions(-) diff --git a/src/sqlmodelgen/codegen/cir_to_full_ast/code_ir_to_ast.py b/src/sqlmodelgen/codegen/cir_to_full_ast/code_ir_to_ast.py index 651af80..2c6a41c 100644 --- a/src/sqlmodelgen/codegen/cir_to_full_ast/code_ir_to_ast.py +++ b/src/sqlmodelgen/codegen/cir_to_full_ast/code_ir_to_ast.py @@ -1,5 +1,5 @@ import ast -from typing import Iterable +from collections.abc import Iterable from sqlmodelgen.codegen.code_ir.code_ir import AttributeIR, AttrCallIR, ModelIR, SchemaNameArgIR from sqlmodelgen.codegen.cir_to_full_ast.to_ast_imports import gen_imports diff --git a/src/sqlmodelgen/codegen/cir_to_full_ast/to_ast_imports.py b/src/sqlmodelgen/codegen/cir_to_full_ast/to_ast_imports.py index be69b34..2d95b64 100644 --- a/src/sqlmodelgen/codegen/cir_to_full_ast/to_ast_imports.py +++ b/src/sqlmodelgen/codegen/cir_to_full_ast/to_ast_imports.py @@ -5,7 +5,7 @@ import ast from itertools import chain -from typing import Iterable, Iterator +from collections.abc import Iterable, Iterator # type union for generic import ast node AST_IMPORT_TYPE = ast.Import | ast.ImportFrom diff --git a/src/sqlmodelgen/codegen/code_ir/build_cir.py b/src/sqlmodelgen/codegen/code_ir/build_cir.py index 4bb673c..74bb058 100644 --- a/src/sqlmodelgen/codegen/code_ir/build_cir.py +++ b/src/sqlmodelgen/codegen/code_ir/build_cir.py @@ -1,4 +1,5 @@ -from typing import Callable +from collections.abc import Callable + from sqlmodelgen.codegen.code_ir.code_ir import ModelIR from sqlmodelgen.codegen.code_ir.build_rels import add_relationships_attrs from sqlmodelgen.codegen.code_ir.build_col_attrs import attribute_from_col diff --git a/src/sqlmodelgen/codegen/code_ir/build_col_attrs.py b/src/sqlmodelgen/codegen/code_ir/build_col_attrs.py index 691f1fa..d2050c7 100644 --- a/src/sqlmodelgen/codegen/code_ir/build_col_attrs.py +++ b/src/sqlmodelgen/codegen/code_ir/build_col_attrs.py @@ -1,5 +1,5 @@ import ast -from typing import Callable +from collections.abc import Callable from sqlmodelgen.codegen.convert_data_type import convert_data_type from sqlmodelgen.codegen.code_ir.code_ir import ( diff --git a/src/sqlmodelgen/codegen/code_ir/build_rels.py b/src/sqlmodelgen/codegen/code_ir/build_rels.py index 1c26b84..e7bc70b 100644 --- a/src/sqlmodelgen/codegen/code_ir/build_rels.py +++ b/src/sqlmodelgen/codegen/code_ir/build_rels.py @@ -1,6 +1,5 @@ import ast - -from typing import Iterator, Iterable +from collections.abc import Iterator, Iterable from sqlmodelgen.codegen.code_ir.code_ir import ( AttributeIR, diff --git a/src/sqlmodelgen/codegen/code_ir/build_table_args.py b/src/sqlmodelgen/codegen/code_ir/build_table_args.py index 523a086..9a8c955 100644 --- a/src/sqlmodelgen/codegen/code_ir/build_table_args.py +++ b/src/sqlmodelgen/codegen/code_ir/build_table_args.py @@ -1,4 +1,4 @@ -from typing import Iterator +from collections.abc import Iterator from sqlmodelgen.codegen.code_ir.code_ir import UniqueTableArgIR, SchemaNameArgIR from sqlmodelgen.ir.ir import TableIR diff --git a/src/sqlmodelgen/codegen/code_ir/code_ir.py b/src/sqlmodelgen/codegen/code_ir/code_ir.py index 3f5f141..b9b7a2f 100644 --- a/src/sqlmodelgen/codegen/code_ir/code_ir.py +++ b/src/sqlmodelgen/codegen/code_ir/code_ir.py @@ -1,8 +1,9 @@ import ast from dataclasses import dataclass, field +from collections.abc import Iterator from enum import StrEnum -from typing import Iterator, Protocol +from typing import Protocol AnnotationType = ast.Name | ast.BitOr | ast.Subscript diff --git a/src/sqlmodelgen/codegen/codegen.py b/src/sqlmodelgen/codegen/codegen.py index 8e637d8..cc37d0a 100644 --- a/src/sqlmodelgen/codegen/codegen.py +++ b/src/sqlmodelgen/codegen/codegen.py @@ -3,7 +3,7 @@ ''' import ast -from typing import Callable, Iterable +from collections.abc import Callable, Iterable from sqlmodelgen.ir.ir import SchemaIR from sqlmodelgen.codegen.code_ir.build_cir import build_model_irs diff --git a/src/sqlmodelgen/ir/mysql/__init__.py b/src/sqlmodelgen/ir/mysql/__init__.py index 5543d05..f69238a 100644 --- a/src/sqlmodelgen/ir/mysql/__init__.py +++ b/src/sqlmodelgen/ir/mysql/__init__.py @@ -1,4 +1,4 @@ -from typing import Iterator +from collections.abc import Iterator from mysql.connector.connection_cext import CMySQLConnection from mysql.connector.cursor_cext import CMySQLCursor diff --git a/src/sqlmodelgen/ir/parse/ir_parse.py b/src/sqlmodelgen/ir/parse/ir_parse.py index b966c8c..e4adf2f 100644 --- a/src/sqlmodelgen/ir/parse/ir_parse.py +++ b/src/sqlmodelgen/ir/parse/ir_parse.py @@ -2,8 +2,8 @@ this module shall account for obtaining the actual intermediate representation ''' - -from typing import Any, Iterator +from collections.abc import Iterator +from typing import Any from sqloxide import parse_sql diff --git a/src/sqlmodelgen/ir/postgres/postgres_collect.py b/src/sqlmodelgen/ir/postgres/postgres_collect.py index 73fed56..039d135 100644 --- a/src/sqlmodelgen/ir/postgres/postgres_collect.py +++ b/src/sqlmodelgen/ir/postgres/postgres_collect.py @@ -4,7 +4,7 @@ import psycopg from dataclasses import dataclass -from typing import Generator, Iterator +from collections.abc import Generator, Iterator from sqlmodelgen.ir.ir import ( ColIR, diff --git a/src/sqlmodelgen/ir/query/__init__.py b/src/sqlmodelgen/ir/query/__init__.py index e0f972c..99ee0ca 100644 --- a/src/sqlmodelgen/ir/query/__init__.py +++ b/src/sqlmodelgen/ir/query/__init__.py @@ -1,5 +1,6 @@ +from collections.abc import Iterable, Iterator from dataclasses import dataclass -from typing import Iterable, Iterator, Protocol +from typing import Protocol from sqlmodelgen.ir.ir import ( ColIR, diff --git a/src/sqlmodelgen/sqlmodelgen.py b/src/sqlmodelgen/sqlmodelgen.py index 88fe898..b89197a 100644 --- a/src/sqlmodelgen/sqlmodelgen.py +++ b/src/sqlmodelgen/sqlmodelgen.py @@ -1,4 +1,4 @@ -from typing import Callable +from collections.abc import Callable from .codegen.codegen import gen_code from .ir.parse.ir_parse import ir_parse diff --git a/tests/helpers/verify_helpers.py b/tests/helpers/verify_helpers.py index fdf055a..f39daba 100644 --- a/tests/helpers/verify_helpers.py +++ b/tests/helpers/verify_helpers.py @@ -4,9 +4,9 @@ """ import sqlite3 +from collections.abc import Callable from pathlib import Path from tempfile import tempdir -from typing import Callable import pytest import psycopg