Skip to content

Commit 39227b7

Browse files
authored
Merge pull request #2595 from DanielNoord/circular-import
Avoid a circular import
2 parents 6dce56c + 25b7145 commit 39227b7

2 files changed

Lines changed: 5 additions & 6 deletions

File tree

isort/settings.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
from typing import Any
2020
from warnings import warn
2121

22-
from . import sorting, stdlibs
22+
from . import stdlibs
2323
from .exceptions import (
2424
FormattingPluginDoesNotExist,
2525
InvalidSettingsPath,
@@ -675,6 +675,8 @@ def sorting_function(self) -> Callable[..., list[str]]:
675675
return self._sorting_function
676676

677677
if self.sort_order == "natural":
678+
from . import sorting # noqa: PLC0415 # Circular import...
679+
678680
self._sorting_function = sorting.naturally
679681
elif self.sort_order == "native":
680682
self._sorting_function = sorted

isort/sorting.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
import re
22
from collections.abc import Callable, Iterable
3-
from typing import TYPE_CHECKING, Any
3+
from typing import Any
44

5-
if TYPE_CHECKING:
6-
from .settings import Config
7-
else:
8-
Config = Any
5+
from .settings import Config
96

107
_import_line_intro_re = re.compile("^(?:from|import) ")
118
_import_line_midline_import_re = re.compile(" import ")

0 commit comments

Comments
 (0)