From fa061e06ebeb776fec25ee59ce4c84fc72f73e8d Mon Sep 17 00:00:00 2001 From: collerek Date: Sat, 5 Jun 2021 18:56:25 +0200 Subject: [PATCH] wip - some cleanup --- ormar/queryset/queryset.py | 3 +-- ormar/queryset/reverse_alias_resolver.py | 3 --- ormar/relations/alias_manager.py | 8 +++++++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ormar/queryset/queryset.py b/ormar/queryset/queryset.py index 2d1ca79..cc9c613 100644 --- a/ormar/queryset/queryset.py +++ b/ormar/queryset/queryset.py @@ -23,11 +23,10 @@ from ormar import MultipleMatches, NoMatch from ormar.exceptions import ModelPersistenceError, QueryDefinitionError from ormar.queryset import FilterQuery, SelectAction from ormar.queryset.actions.order_action import OrderAction -from ormar.queryset.clause import FilterGroup, Prefix, QueryClause +from ormar.queryset.clause import FilterGroup, QueryClause from ormar.queryset.prefetch_query import PrefetchQuery from ormar.queryset.query import Query from ormar.queryset.reverse_alias_resolver import ReverseAliasResolver -from ormar.queryset.utils import get_relationship_alias_model_and_str if TYPE_CHECKING: # pragma no cover from ormar import Model diff --git a/ormar/queryset/reverse_alias_resolver.py b/ormar/queryset/reverse_alias_resolver.py index af916bc..a0919cb 100644 --- a/ormar/queryset/reverse_alias_resolver.py +++ b/ormar/queryset/reverse_alias_resolver.py @@ -1,8 +1,5 @@ from typing import Dict, List, TYPE_CHECKING, Tuple, Type -from ormar.queryset.clause import Prefix -from ormar.queryset.utils import get_relationship_alias_model_and_str - if TYPE_CHECKING: from ormar import Model from ormar.models.excludable import ExcludableItems diff --git a/ormar/relations/alias_manager.py b/ormar/relations/alias_manager.py index 2ad8733..adf711a 100644 --- a/ormar/relations/alias_manager.py +++ b/ormar/relations/alias_manager.py @@ -43,7 +43,13 @@ class AliasManager: return self._aliases_new.__getitem__(key) @property - def reversed_aliases(self): + def reversed_aliases(self) -> Dict: + """ + Returns swapped key-value pairs from aliases where alias is the key. + + :return: dictionary of prefix to relation + :rtype: Dict + """ if self._reversed_aliases: return self._reversed_aliases reversed_aliases = {v: k for k, v in self._aliases_new.items()}