diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2022-05-16 02:32:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@ci3.zzzcomputing.com> | 2022-05-16 02:32:44 +0000 |
| commit | 5d080d17464712d33c0215d12513e529d848ee8c (patch) | |
| tree | eec56f3138a48f55f2585a64f01b4fd9c14451b7 /lib/sqlalchemy/util/_collections.py | |
| parent | c4dad3695f4ab9fef3a4cb05893492afbec811f7 (diff) | |
| parent | 18a73fb1d1c267842ead5dacd05a49f4344d8b22 (diff) | |
| download | sqlalchemy-5d080d17464712d33c0215d12513e529d848ee8c.tar.gz | |
Merge "revenge of pep 484" into main
Diffstat (limited to 'lib/sqlalchemy/util/_collections.py')
| -rw-r--r-- | lib/sqlalchemy/util/_collections.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/util/_collections.py b/lib/sqlalchemy/util/_collections.py index 7150dedcf..54be2e4e5 100644 --- a/lib/sqlalchemy/util/_collections.py +++ b/lib/sqlalchemy/util/_collections.py @@ -71,7 +71,7 @@ _T_co = TypeVar("_T_co", covariant=True) EMPTY_SET: FrozenSet[Any] = frozenset() -def merge_lists_w_ordering(a, b): +def merge_lists_w_ordering(a: List[Any], b: List[Any]) -> List[Any]: """merge two lists, maintaining ordering as much as possible. this is to reconcile vars(cls) with cls.__annotations__. @@ -450,7 +450,7 @@ def to_set(x): return x -def to_column_set(x): +def to_column_set(x: Any) -> Set[Any]: if x is None: return column_set() if not isinstance(x, column_set): |