Skip to content

Commit 03e4eeb

Browse files
committed
Reformat imports to new single-line settings
1 parent 9ccb16e commit 03e4eeb

71 files changed

Lines changed: 494 additions & 333 deletions

File tree

Some content is hidden

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

morango/api/permissions.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
import json
22

3-
from django.contrib.auth import authenticate, get_user_model
4-
from rest_framework import authentication, exceptions, permissions
3+
from django.contrib.auth import authenticate
4+
from django.contrib.auth import get_user_model
5+
from rest_framework import authentication
6+
from rest_framework import exceptions
7+
from rest_framework import permissions
58

69
from morango.models.core import TransferSession
710
from morango.utils import SETTINGS

morango/api/serializers.py

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
1-
from rest_framework import exceptions, serializers
1+
from rest_framework import exceptions
2+
from rest_framework import serializers
23
from rest_framework.fields import ReadOnlyField
34

45
from ..models.certificates import Nonce
5-
from ..models.core import (
6-
Buffer,
7-
Certificate,
8-
InstanceIDModel,
9-
RecordMaxCounterBuffer,
10-
SyncSession,
11-
TransferSession,
12-
)
6+
from ..models.core import Buffer
7+
from ..models.core import Certificate
8+
from ..models.core import InstanceIDModel
9+
from ..models.core import RecordMaxCounterBuffer
10+
from ..models.core import SyncSession
11+
from ..models.core import TransferSession
1312
from ..models.fields.crypto import SharedKey
1413
from ..utils import SETTINGS
1514
from .fields import PublicKeyField

morango/api/urls.py

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
from rest_framework import routers
22

3-
from .viewsets import (
4-
BufferViewSet,
5-
CertificateChainViewSet,
6-
CertificateViewSet,
7-
MorangoInfoViewSet,
8-
NonceViewSet,
9-
PublicKeyViewSet,
10-
SyncSessionViewSet,
11-
TransferSessionViewSet,
12-
)
3+
from .viewsets import BufferViewSet
4+
from .viewsets import CertificateChainViewSet
5+
from .viewsets import CertificateViewSet
6+
from .viewsets import MorangoInfoViewSet
7+
from .viewsets import NonceViewSet
8+
from .viewsets import PublicKeyViewSet
9+
from .viewsets import SyncSessionViewSet
10+
from .viewsets import TransferSessionViewSet
1311

1412
router = routers.SimpleRouter()
1513
router.register(r"certificates", CertificateViewSet, basename="certificates")

morango/api/viewsets.py

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,33 @@
66
from django.core.exceptions import ValidationError
77
from django.utils import timezone
88
from ipware import get_client_ip
9-
from rest_framework import mixins, pagination, response, status, viewsets
9+
from rest_framework import mixins
10+
from rest_framework import pagination
11+
from rest_framework import response
12+
from rest_framework import status
13+
from rest_framework import viewsets
1014
from rest_framework.parsers import JSONParser
1115

1216
import morango
1317
from morango import errors
14-
from morango.api import permissions, serializers
15-
from morango.constants import transfer_stages, transfer_statuses
16-
from morango.constants.capabilities import ASYNC_OPERATIONS, GZIP_BUFFER_POST
18+
from morango.api import permissions
19+
from morango.api import serializers
20+
from morango.constants import transfer_stages
21+
from morango.constants import transfer_statuses
22+
from morango.constants.capabilities import ASYNC_OPERATIONS
23+
from morango.constants.capabilities import GZIP_BUFFER_POST
1724
from morango.models import certificates
18-
from morango.models.core import Buffer, Certificate, InstanceIDModel, SyncSession, TransferSession
25+
from morango.models.core import Buffer
26+
from morango.models.core import Certificate
27+
from morango.models.core import InstanceIDModel
28+
from morango.models.core import SyncSession
29+
from morango.models.core import TransferSession
1930
from morango.models.fields.crypto import SharedKey
2031
from morango.sync.context import LocalSessionContext
2132
from morango.sync.controller import SessionController
22-
from morango.utils import CAPABILITIES, _assert, parse_capabilities_from_server_request
33+
from morango.utils import _assert
34+
from morango.utils import CAPABILITIES
35+
from morango.utils import parse_capabilities_from_server_request
2336

2437
if GZIP_BUFFER_POST in CAPABILITIES:
2538
from .parsers import GzipParser

morango/apps.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
from django.apps import AppConfig
22

3-
from morango.registry import session_middleware, syncable_models
3+
from morango.registry import session_middleware
4+
from morango.registry import syncable_models
45

56

67
class MorangoConfig(AppConfig):

morango/management/commands/cleanupsyncs.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
from django.db import transaction
77
from django.utils import timezone
88

9-
from morango.models import SyncSession, TransferSession
9+
from morango.models import SyncSession
10+
from morango.models import TransferSession
1011

1112
logger = logging.getLogger(__name__)
1213

morango/migrations/0001_initial.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
# Generated by Django 1.9 on 2017-05-08 23:42
33
import django.db.models.deletion
44
import django.utils.timezone
5-
from django.db import migrations, models
5+
from django.db import migrations
6+
from django.db import models
67

78
import morango.models.fields.crypto
89
import morango.models.fields.uuids

morango/migrations/0001_squashed_0024_auto_20240129_1757.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
import django.db.models.deletion
33
import django.db.models.manager
44
import django.utils.timezone
5-
from django.db import migrations, models
5+
from django.db import migrations
6+
from django.db import models
67

78
import morango.models.fields.crypto
89
import morango.models.fields.uuids

morango/migrations/0002_auto_20170511_0400.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
# -*- coding: utf-8 -*-
22
# Generated by Django 1.9.7 on 2017-05-11 04:00
33
import django.db.models.manager
4-
from django.db import migrations, models
4+
from django.db import migrations
5+
from django.db import models
56

67
import morango.models.fields.uuids
78

morango/migrations/0002_store_idx_morango_deserialize.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Generated by Django 3.2.24 on 2024-10-18 23:18
2-
from django.db import migrations, models
2+
from django.db import migrations
3+
from django.db import models
34

45

56
class Migration(migrations.Migration):

0 commit comments

Comments
 (0)