- Fixed #1301: Import headings in nested sections leads to check errors

isort/__init__.py

@@ -6,3 +6,4 @@
 from .api import sort_code_string as code
 from .api import sort_file as file
 from .api import sort_stream as stream
+from .settings import Config

isort/api.py

@@ -8,10 +8,18 @@
 from warnings import warn
 
 from . import io, output, parse
-from .exceptions import (ExistingSyntaxErrors, FileSkipComment,
-                         FileSkipSetting, IntroducedSyntaxErrors)
-from .format import (ask_whether_to_apply_changes_to_file, format_natural,
-                     remove_whitespace, show_unified_diff)
+from .exceptions import (
+    ExistingSyntaxErrors,
+    FileSkipComment,
+    FileSkipSetting,
+    IntroducedSyntaxErrors,
+)
+from .format import (
+    ask_whether_to_apply_changes_to_file,
+    format_natural,
+    remove_whitespace,
+    show_unified_diff,
+)
 from .io import Empty
 from .place import module as place_module  # skipcq: PYL-W0611 (intended export of public API)
 from .place import module_with_reason as place_module_with_reason  # skipcq: PYL-W0611 (^)

isort/hooks.py

@@ -3,11 +3,12 @@
 usage:
     exit_code = git_hook(strict=True|False, modify=True|False)
 """
+import os
 import subprocess  # nosec - Needed for hook
 from pathlib import Path
 from typing import List
 
-from isort import api
+from isort import Config, api
 
 
 def get_output(command: List[str]) -> str:
@@ -51,17 +52,16 @@ def git_hook(strict: bool = False, modify: bool = False) -> int:
     files_modified = get_lines(diff_cmd)
 
     errors = 0
+    config = Config(settings_path=os.path.dirname(os.path.abspath(files_modified[0])))
     for filename in files_modified:
         if filename.endswith(".py"):
             # Get the staged contents of the file
             staged_cmd = ["git", "show", f":{filename}"]
             staged_contents = get_output(staged_cmd)
 
-            if not api.check_code_string(
-                staged_contents, file_path=Path(filename), settings_path=Path(filename).parent
-            ):
+            if not api.check_code_string(staged_contents, file_path=Path(filename), config=config):
                 errors += 1
                 if modify:
-                    api.sort_file(filename, settings_path=Path(filename).parent)
+                    api.sort_file(filename, config=config)
 
     return errors if strict else 0

isort/settings.py

@@ -11,8 +11,7 @@
 from distutils.util import strtobool as _as_bool
 from functools import lru_cache
 from pathlib import Path
-from typing import (Any, Callable, Dict, FrozenSet, Iterable, List, Optional,
-                    Pattern, Set, Tuple)
+from typing import Any, Callable, Dict, FrozenSet, Iterable, List, Optional, Pattern, Set, Tuple
 from warnings import warn
 
 from . import stdlibs