Skip to content

Commit 5311540

Browse files
committed
Fix import applying isort via pre-commit
1 parent c924201 commit 5311540

File tree

79 files changed

+239
-201
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+239
-201
lines changed

docker-app/qfieldcloud/authentication/authentication.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@
33
from django.http.request import HttpRequest
44
from django.utils import timezone
55
from django.utils.translation import gettext as _
6-
from qfieldcloud.core.models import User
76
from rest_framework.authentication import (
87
TokenAuthentication as DjangoRestFrameworkTokenAuthentication,
98
)
109

10+
from qfieldcloud.core.models import User
11+
1112
from ..core.exceptions import AuthenticationViaTokenFailedError
1213
from .models import AuthToken
1314

docker-app/qfieldcloud/authentication/migrations/0001_initial.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
# Generated by Django 3.2.7 on 2021-10-01 22:01
22

33
import django.db.models.deletion
4-
import qfieldcloud.authentication.models
54
from django.conf import settings
65
from django.db import migrations, models
76

7+
import qfieldcloud.authentication.models
8+
89

910
class Migration(migrations.Migration):
1011
initial = True

docker-app/qfieldcloud/authentication/tests/test_authentication.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@
33

44
from django.core.files.base import ContentFile
55
from django.utils.timezone import now
6+
from rest_framework.test import APITransactionTestCase
7+
68
from qfieldcloud.authentication.models import AuthToken
79
from qfieldcloud.core.models import Organization, Person, Team
810
from qfieldcloud.core.tests.utils import setup_subscription_plans
9-
from rest_framework.test import APITransactionTestCase
1011

1112
logging.disable(logging.CRITICAL)
1213

docker-app/qfieldcloud/core/adapters.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
from allauth.account.adapter import DefaultAccountAdapter
33
from django.core.exceptions import ValidationError
44
from invitations.adapters import BaseInvitationsAdapter
5+
56
from qfieldcloud.core.models import Person
67
from allauth.account.models import EmailConfirmationHMAC
78
from django.http import HttpRequest

docker-app/qfieldcloud/core/admin.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@
3737
from django.views.decorators.cache import never_cache
3838
from invitations.admin import InvitationAdmin as InvitationAdminBase
3939
from invitations.utils import get_invitation_model
40+
from rest_framework.authtoken.models import TokenProxy
41+
4042
from qfieldcloud.core import exceptions
4143
from qfieldcloud.core.models import (
4244
ApplyJob,
@@ -58,7 +60,6 @@
5860
from qfieldcloud.core.paginators import LargeTablePaginator
5961
from qfieldcloud.core.templatetags.filters import filesizeformat10
6062
from qfieldcloud.core.utils2 import delta_utils, jobs, pg_service_file
61-
from rest_framework.authtoken.models import TokenProxy
6263

6364
admin.site.unregister(LogEntry)
6465

docker-app/qfieldcloud/core/cron.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
from invitations.utils import get_invitation_model
88
from sentry_sdk import capture_message
99

10+
from qfieldcloud.filestorage.models import File
11+
1012
from ..core.models import ApplyJob, ApplyJobDelta, Delta, Job, Project
1113
from ..core.utils2 import storage
1214
from .invitations_utils import send_invitation
13-
from qfieldcloud.filestorage.models import File
14-
1515

1616
logger = logging.getLogger(__name__)
1717

docker-app/qfieldcloud/core/drf_utils.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1+
from typing import Iterable
2+
13
from django.db.models import QuerySet
24
from rest_framework import filters, views
35
from rest_framework.request import Request
4-
from typing import Iterable
56

67

78
class QfcOrderingFilter(filters.OrderingFilter):

docker-app/qfieldcloud/core/fields.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
from __future__ import annotations
22

3-
from typing import Protocol, cast, Any
43
from collections.abc import Callable
5-
from django.db import models
6-
from django.db.models.fields.files import FieldFile
4+
from typing import Any, Protocol, cast
5+
76
from django.core.files.storage import storages
8-
from django.db.models.fields.files import ImageFieldFile, ImageField
7+
from django.db import models
8+
from django.db.models.fields.files import FieldFile, ImageField, ImageFieldFile
99

1010

1111
class FileStorageNameModelProtocol(Protocol):

docker-app/qfieldcloud/core/invitations_utils.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
from invitations.adapters import get_invitations_adapter
1010
from invitations.signals import invite_url_sent
1111
from invitations.utils import get_invitation_model
12+
1213
from qfieldcloud.core import permissions_utils
1314
from qfieldcloud.core.models import Person
1415

docker-app/qfieldcloud/core/management/commands/extracts3data.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
from typing import Generator, Iterable
55

66
import mypy_boto3_s3
7-
from django.core.management.base import BaseCommand, CommandParser
8-
from django.core.files.storage import get_storage_class
97
from django.conf import settings
8+
from django.core.files.storage import get_storage_class
9+
from django.core.management.base import BaseCommand, CommandParser
1010
from storages.backends.s3boto3 import S3Boto3Storage
1111

1212
logger = logging.getLogger(__name__)

0 commit comments

Comments
 (0)