Fix isort errors.

hramezani · bluetech · commit f2e80f69ca0d · 2021-10-17T18:02:29.000+03:00
diff --git a/pytest_django/asserts.py b/pytest_django/asserts.py
@@ -1,12 +1,11 @@
 """
 Dynamically load all Django assertion cases and expose them for importing.
 """
-from typing import Any, Callable, Optional, Sequence, Set, Union
 from functools import wraps
+from typing import Any, Callable, Optional, Sequence, Set, Union
 
 from django.test import (
-    TestCase, SimpleTestCase,
-    LiveServerTestCase, TransactionTestCase
+    LiveServerTestCase, SimpleTestCase, TestCase, TransactionTestCase,
 )
 
 TYPE_CHECKING = False
diff --git a/pytest_django/fixtures.py b/pytest_django/fixtures.py
@@ -1,14 +1,16 @@
 """All pytest-django fixtures"""
-from typing import Any, Callable, Generator, Iterable, List, Optional, Tuple, Union
 import os
 from contextlib import contextmanager
 from functools import partial
+from typing import (
+    Any, Callable, Generator, Iterable, List, Optional, Tuple, Union,
+)
 
 import pytest
 
 from . import live_server_helper
 from .django_compat import is_django_unittest
-from .lazy_django import skip_if_no_django, get_django_version
+from .lazy_django import get_django_version, skip_if_no_django
 
 TYPE_CHECKING = False
 if TYPE_CHECKING:
@@ -155,8 +157,8 @@ def _django_db_fixture_helper(
     django_db_blocker.unblock()
     request.addfinalizer(django_db_blocker.restore)
 
-    import django.test
     import django.db
+    import django.test
 
     if transactional:
         test_case_class = django.test.TransactionTestCase
diff --git a/pytest_django/lazy_django.py b/pytest_django/lazy_django.py
@@ -1,9 +1,9 @@
 """
 Helpers to load Django lazily when Django settings can't be configured.
 """
-from typing import Any, Tuple
 import os
 import sys
+from typing import Any, Tuple
 
 import pytest
 
diff --git a/pytest_django/live_server_helper.py b/pytest_django/live_server_helper.py
@@ -1,4 +1,4 @@
-from typing import Dict, Any
+from typing import Any, Dict
 
 
 class LiveServer:
diff --git a/pytest_django/plugin.py b/pytest_django/plugin.py
@@ -4,43 +4,42 @@
 test database and provides some useful text fixtures.
 """
 
-from typing import Generator, List, Optional, Tuple, Union
 import contextlib
 import inspect
-from functools import reduce
 import os
 import pathlib
 import sys
+from functools import reduce
+from typing import Generator, List, Optional, Tuple, Union
 
 import pytest
 
 from .django_compat import is_django_unittest  # noqa
-from .fixtures import django_assert_num_queries  # noqa
-from .fixtures import django_assert_max_num_queries  # noqa
-from .fixtures import django_db_setup  # noqa
-from .fixtures import django_db_use_migrations  # noqa
-from .fixtures import django_db_keepdb  # noqa
-from .fixtures import django_db_createdb  # noqa
-from .fixtures import django_db_modify_db_settings  # noqa
-from .fixtures import django_db_modify_db_settings_parallel_suffix  # noqa
-from .fixtures import django_db_modify_db_settings_tox_suffix  # noqa
-from .fixtures import django_db_modify_db_settings_xdist_suffix  # noqa
-from .fixtures import django_capture_on_commit_callbacks  # noqa
 from .fixtures import _live_server_helper  # noqa
 from .fixtures import admin_client  # noqa
 from .fixtures import admin_user  # noqa
 from .fixtures import async_client  # noqa
+from .fixtures import async_rf  # noqa
 from .fixtures import client  # noqa
 from .fixtures import db  # noqa
+from .fixtures import django_assert_max_num_queries  # noqa
+from .fixtures import django_assert_num_queries  # noqa
+from .fixtures import django_capture_on_commit_callbacks  # noqa
+from .fixtures import django_db_createdb  # noqa
+from .fixtures import django_db_keepdb  # noqa
+from .fixtures import django_db_modify_db_settings  # noqa
+from .fixtures import django_db_modify_db_settings_parallel_suffix  # noqa
+from .fixtures import django_db_modify_db_settings_tox_suffix  # noqa
+from .fixtures import django_db_modify_db_settings_xdist_suffix  # noqa
+from .fixtures import django_db_reset_sequences  # noqa
+from .fixtures import django_db_setup  # noqa
+from .fixtures import django_db_use_migrations  # noqa
 from .fixtures import django_user_model  # noqa
 from .fixtures import django_username_field  # noqa
 from .fixtures import live_server  # noqa
-from .fixtures import django_db_reset_sequences  # noqa
-from .fixtures import async_rf  # noqa
 from .fixtures import rf  # noqa
 from .fixtures import settings  # noqa
 from .fixtures import transactional_db  # noqa
-
 from .lazy_django import django_settings_is_configured, skip_if_no_django
 
 TYPE_CHECKING = False
@@ -416,7 +415,9 @@ def django_test_environment(request) -> None:
     """
     if django_settings_is_configured():
         _setup_django()
-        from django.test.utils import setup_test_environment, teardown_test_environment
+        from django.test.utils import (
+            setup_test_environment, teardown_test_environment,
+        )
 
         debug_ini = request.config.getini("django_debug_mode")
         if debug_ini == "keep":
diff --git a/pytest_django_test/db_helpers.py b/pytest_django_test/db_helpers.py
@@ -1,13 +1,11 @@
 import os
-import subprocess
 import sqlite3
+import subprocess
 
 import pytest
-
 from django.conf import settings
 from django.utils.encoding import force_str
 
-
 # Construct names for the "inner" database used in runpytest tests
 _settings = settings.DATABASES["default"]
 
diff --git a/pytest_django_test/settings_mysql_innodb.py b/pytest_django_test/settings_mysql_innodb.py
@@ -2,7 +2,6 @@
 
 from .settings_base import *  # noqa: F401 F403
 
-
 DATABASES = {
     "default": {
         "ENGINE": "django.db.backends.mysql",
diff --git a/pytest_django_test/settings_mysql_myisam.py b/pytest_django_test/settings_mysql_myisam.py
@@ -2,7 +2,6 @@
 
 from .settings_base import *  # noqa: F401 F403
 
-
 DATABASES = {
     "default": {
         "ENGINE": "django.db.backends.mysql",
diff --git a/pytest_django_test/settings_sqlite.py b/pytest_django_test/settings_sqlite.py
@@ -1,6 +1,5 @@
 from .settings_base import *  # noqa: F401 F403
 
-
 DATABASES = {
     "default": {
         "ENGINE": "django.db.backends.sqlite3",
diff --git a/pytest_django_test/urls_overridden.py b/pytest_django_test/urls_overridden.py
@@ -1,5 +1,5 @@
-from django.urls import path
 from django.http import HttpResponse
+from django.urls import path
 
 urlpatterns = [
     path("overridden_url/", lambda r: HttpResponse("Overridden urlconf works!"))
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -1,13 +1,12 @@
-from typing import Optional
 import copy
+import pathlib
 import shutil
 from textwrap import dedent
-import pathlib
+from typing import Optional
 
 import pytest
 from django.conf import settings
 
-
 pytest_plugins = "pytester"
 
 REPOSITORY_ROOT = pathlib.Path(__file__).parent
@@ -40,7 +39,7 @@ def testdir(testdir, monkeypatch):
 @pytest.fixture(scope="function")
 def django_testdir(request, testdir, monkeypatch):
     from pytest_django_test.db_helpers import (
-        DB_NAME, TEST_DB_NAME, SECOND_DB_NAME, SECOND_TEST_DB_NAME,
+        DB_NAME, SECOND_DB_NAME, SECOND_TEST_DB_NAME, TEST_DB_NAME,
     )
 
     marker = request.node.get_closest_marker("django_project")
diff --git a/tests/test_asserts.py b/tests/test_asserts.py
@@ -1,22 +1,23 @@
 """
 Tests the dynamic loading of all Django assertion cases.
 """
-from typing import List
 import inspect
+from typing import List
 
 import pytest
-import pytest_django
 
+import pytest_django
 from pytest_django.asserts import __all__ as asserts_all
 
 
 def _get_actual_assertions_names() -> List[str]:
     """
     Returns list with names of all assertion helpers in Django.
     """
-    from django.test import TestCase as DjangoTestCase
     from unittest import TestCase as DefaultTestCase
 
+    from django.test import TestCase as DjangoTestCase
+
     obj = DjangoTestCase('run')
 
     def is_assert(func) -> bool:
@@ -42,6 +43,7 @@ def test_django_asserts_available() -> None:
 @pytest.mark.django_db
 def test_sanity() -> None:
     from django.http import HttpResponse
+
     from pytest_django.asserts import assertContains, assertNumQueries
 
     response = HttpResponse('My response')
diff --git a/tests/test_db_setup.py b/tests/test_db_setup.py
@@ -1,10 +1,7 @@
 import pytest
 
 from pytest_django_test.db_helpers import (
-    db_exists,
-    drop_database,
-    mark_database,
-    mark_exists,
+    db_exists, drop_database, mark_database, mark_exists,
     skip_if_sqlite_in_memory,
 )
 
diff --git a/tests/test_django_settings_module.py b/tests/test_django_settings_module.py
@@ -5,7 +5,6 @@
 
 import pytest
 
-
 BARE_SETTINGS = """
 # At least one database must be configured
 DATABASES = {
diff --git a/tests/test_environment.py b/tests/test_environment.py
@@ -1,15 +1,14 @@
 import os
 
 import pytest
-from django.contrib.sites.models import Site
 from django.contrib.sites import models as site_models
+from django.contrib.sites.models import Site
 from django.core import mail
 from django.db import connection
 from django.test import TestCase
 
 from pytest_django_test.app.models import Item
 
-
 # It doesn't matter which order all the _again methods are run, we just need
 # to check the environment remains constant.
 # This is possible with some of the testdir magic, but this is the lazy way
diff --git a/tests/test_fixtures.py b/tests/test_fixtures.py
@@ -3,9 +3,9 @@
 Not quite all fixtures are tested here, the db and transactional_db
 fixtures are tested in test_database.
 """
-from typing import Generator
 import socket
 from contextlib import contextmanager
+from typing import Generator
 from urllib.error import HTTPError
 from urllib.request import urlopen
 
@@ -16,8 +16,8 @@
 from django.test.client import Client, RequestFactory
 from django.utils.encoding import force_str
 
-from pytest_django_test.app.models import Item
 from pytest_django.lazy_django import get_django_version
+from pytest_django_test.app.models import Item
 
 
 @contextmanager

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from typing import Dict, Any`
	`1`	`+from typing import Any, Dict`
`2`	`2`
`3`	`3`
`4`	`4`	`class LiveServer:`