Fix handling of mix indented imports

PyCQA · Nov 4, 2020 · cd38767 · cd38767
1 parent 69f2a35
commit cd38767
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 2 deletions.
diff --git a/isort/core.py b/isort/core.py
@@ -276,7 +276,12 @@ def write(self, *a, **kw):
                     ):
                         cimport_statement = True
 
-                    if cimport_statement != cimports and import_section:
+                    if cimport_statement != cimports or (
+                        new_indent != indent
+                        and import_section
+                        and (not did_contain_imports or len(new_indent) < len(indent))
+                    ):
+                        indent = new_indent
                         if import_section:
                             next_cimports = cimport_statement
                             next_import_section = import_statement
@@ -288,7 +293,7 @@ def write(self, *a, **kw):
                     else:
                         if new_indent != indent:
                             if import_section and did_contain_imports:
-                                import_statement = import_statement.lstrip()
+                                import_statement = indent + import_statement.lstrip()
                             else:
                                 indent = new_indent
                     import_section += import_statement

diff --git a/tests/unit/test_ticketed_features.py b/tests/unit/test_ticketed_features.py
@@ -892,5 +892,34 @@ def test_autofix_mixed_indent_imports_1575():
         )
         == """
 import os
+"""
+    )
+    assert (
+        isort.code(
+            """
+def one():
+    import os
+import os
+    """
+        )
+        == """
+def one():
+    import os
+
+import os
+"""
+    )
+    assert (
+        isort.code(
+            """
+import os
+    import os
+        import os
+    import os
+import os
+"""
+        )
+        == """
+import os
 """
     )