Skip to content

Commit 510b266

Browse files
committed
chore: sorted imports
1 parent 2a2a193 commit 510b266

4 files changed

Lines changed: 41 additions & 54 deletions

File tree

openedx/core/djangoapps/content_libraries/api/libraries.py

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,11 @@
4141
"""
4242
from __future__ import annotations
4343

44-
from dataclasses import dataclass, field as dataclass_field
45-
from datetime import datetime
4644
import logging
4745
import os
46+
from dataclasses import dataclass
47+
from dataclasses import field as dataclass_field
48+
from datetime import datetime
4849

4950
from django.conf import settings
5051
from django.contrib.auth.models import AbstractUser, AnonymousUser, Group
@@ -54,31 +55,25 @@
5455
from django.db.models import Q, QuerySet
5556
from django.utils.translation import gettext as _
5657
from opaque_keys.edx.locator import LibraryLocatorV2, LibraryUsageLocatorV2
57-
from openedx_events.content_authoring.data import (
58-
ContentLibraryData,
59-
)
58+
from openedx_events.content_authoring.data import ContentLibraryData
6059
from openedx_events.content_authoring.signals import (
6160
CONTENT_LIBRARY_CREATED,
6261
CONTENT_LIBRARY_DELETED,
63-
CONTENT_LIBRARY_UPDATED,
62+
CONTENT_LIBRARY_UPDATED
6463
)
6564
from openedx_learning.api import authoring as authoring_api
6665
from openedx_learning.api.authoring_models import Component
6766
from organizations.models import Organization
6867
from storages.backends.s3boto3 import S3Boto3Storage
68+
from user_tasks.models import UserTaskArtifact, UserTaskStatus
6969
from xblock.core import XBlock
70-
from user_tasks.models import UserTaskStatus, UserTaskArtifact
7170

7271
from openedx.core.types import User as UserType
7372

74-
from .. import permissions
73+
from .. import permissions, tasks
7574
from ..constants import ALL_RIGHTS_RESERVED
7675
from ..models import ContentLibrary, ContentLibraryPermission
77-
from .. import tasks
78-
from .exceptions import (
79-
LibraryAlreadyExists,
80-
LibraryPermissionIntegrityError,
81-
)
76+
from .exceptions import LibraryAlreadyExists, LibraryPermissionIntegrityError
8277

8378
log = logging.getLogger(__name__)
8479

openedx/core/djangoapps/content_libraries/rest_api/libraries.py

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
import json
6767
import logging
6868

69+
import edx_api_doc_tools as apidocs
6970
from django.conf import settings
7071
from django.contrib.auth import authenticate, get_user_model, login
7172
from django.contrib.auth.models import Group
@@ -78,30 +79,28 @@
7879
from django.views.decorators.csrf import csrf_exempt
7980
from django.views.generic.base import TemplateResponseMixin, View
8081
from drf_yasg.utils import swagger_auto_schema
81-
from openedx.core.djangoapps.content_libraries.api.libraries import get_backup_task_status
82-
from pylti1p3.contrib.django import DjangoCacheDataStorage, DjangoDbToolConf, DjangoMessageLaunch, DjangoOIDCLogin
83-
from pylti1p3.exception import LtiException, OIDCException
84-
85-
import edx_api_doc_tools as apidocs
8682
from opaque_keys.edx.locator import LibraryLocatorV2, LibraryUsageLocatorV2
8783
from organizations.api import ensure_organization
8884
from organizations.exceptions import InvalidOrganizationException
8985
from organizations.models import Organization
86+
from pylti1p3.contrib.django import DjangoCacheDataStorage, DjangoDbToolConf, DjangoMessageLaunch, DjangoOIDCLogin
87+
from pylti1p3.exception import LtiException, OIDCException
9088
from rest_framework import status
9189
from rest_framework.exceptions import NotFound, PermissionDenied, ValidationError
9290
from rest_framework.generics import GenericAPIView
9391
from rest_framework.response import Response
9492
from rest_framework.views import APIView
9593
from rest_framework.viewsets import GenericViewSet
9694

97-
95+
import openedx.core.djangoapps.site_configuration.helpers as configuration_helpers
9896
from cms.djangoapps.contentstore.views.course import (
9997
get_allowed_organizations_for_libraries,
100-
user_can_create_organizations,
98+
user_can_create_organizations
10199
)
102100
from openedx.core.djangoapps.content_libraries import api, permissions
103-
from openedx.core.djangoapps.content_libraries.tasks import backup_library
101+
from openedx.core.djangoapps.content_libraries.api.libraries import get_backup_task_status
104102
from openedx.core.djangoapps.content_libraries.rest_api.serializers import (
103+
ContentLibraryAddPermissionByEmailSerializer,
105104
ContentLibraryBlockImportTaskCreateSerializer,
106105
ContentLibraryBlockImportTaskSerializer,
107106
ContentLibraryFilterSerializer,
@@ -114,17 +113,15 @@
114113
LibraryXBlockCreationSerializer,
115114
LibraryXBlockMetadataSerializer,
116115
LibraryXBlockTypeSerializer,
117-
ContentLibraryAddPermissionByEmailSerializer,
118-
PublishableItemSerializer,
116+
PublishableItemSerializer
119117
)
120-
import openedx.core.djangoapps.site_configuration.helpers as configuration_helpers
121-
from openedx.core.lib.api.view_utils import view_auth_classes
118+
from openedx.core.djangoapps.content_libraries.tasks import backup_library
122119
from openedx.core.djangoapps.safe_sessions.middleware import mark_user_change_as_expected
123120
from openedx.core.djangoapps.xblock import api as xblock_api
121+
from openedx.core.lib.api.view_utils import view_auth_classes
124122

125-
from .utils import convert_exceptions
126123
from ..models import ContentLibrary, LtiGradedResource, LtiProfile
127-
124+
from .utils import convert_exceptions
128125

129126
User = get_user_model()
130127
log = logging.getLogger(__name__)

openedx/core/djangoapps/content_libraries/rest_api/serializers.py

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,22 @@
33
"""
44
# pylint: disable=abstract-method
55
from django.core.validators import validate_unicode_slug
6+
from opaque_keys import InvalidKeyError, OpaqueKey
7+
from opaque_keys.edx.locator import LibraryContainerLocator, LibraryUsageLocatorV2
8+
from openedx_learning.api.authoring_models import Collection
69
from rest_framework import serializers
710
from rest_framework.exceptions import ValidationError
811

9-
from opaque_keys import OpaqueKey
10-
from opaque_keys.edx.locator import LibraryContainerLocator, LibraryUsageLocatorV2
11-
from opaque_keys import InvalidKeyError
12-
13-
from openedx_learning.api.authoring_models import Collection
1412
from openedx.core.djangoapps.content_libraries.api.containers import ContainerType
15-
from openedx.core.djangoapps.content_libraries.constants import (
16-
ALL_RIGHTS_RESERVED,
17-
LICENSE_OPTIONS,
18-
)
13+
from openedx.core.djangoapps.content_libraries.constants import ALL_RIGHTS_RESERVED, LICENSE_OPTIONS
1914
from openedx.core.djangoapps.content_libraries.models import (
20-
ContentLibraryPermission, ContentLibraryBlockImportTask,
21-
ContentLibrary
15+
ContentLibrary,
16+
ContentLibraryBlockImportTask,
17+
ContentLibraryPermission
2218
)
2319
from openedx.core.lib.api.serializers import CourseKeyField
24-
from .. import permissions
2520

21+
from .. import permissions
2622

2723
DATETIME_FORMAT = '%Y-%m-%dT%H:%M:%SZ'
2824

openedx/core/djangoapps/content_libraries/tasks.py

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,41 +18,40 @@
1818

1919
import logging
2020
import os
21-
from path import Path
2221
from tempfile import mkdtemp
2322

2423
from celery import shared_task
25-
from celery_utils.logged_task import LoggedTask
2624
from celery.utils.log import get_task_logger
25+
from celery_utils.logged_task import LoggedTask
2726
from django.core.files import File
28-
from edx_django_utils.monitoring import set_code_owner_attribute, set_code_owner_attribute_from_module, set_custom_attribute
27+
from edx_django_utils.monitoring import (
28+
set_code_owner_attribute,
29+
set_code_owner_attribute_from_module,
30+
set_custom_attribute
31+
)
2932
from opaque_keys.edx.keys import CourseKey
3033
from opaque_keys.edx.locator import (
3134
BlockUsageLocator,
3235
LibraryCollectionLocator,
3336
LibraryContainerLocator,
34-
LibraryLocatorV2,
35-
)
36-
from openedx_learning.api import authoring as authoring_api
37-
from openedx_learning.api.authoring_models import DraftChangeLog, PublishLog
38-
from openedx_learning.api.authoring import create_zip_file as create_lib_zip_file
39-
from openedx_events.content_authoring.data import (
40-
LibraryBlockData,
41-
LibraryCollectionData,
42-
LibraryContainerData,
37+
LibraryLocatorV2
4338
)
39+
from openedx_events.content_authoring.data import LibraryBlockData, LibraryCollectionData, LibraryContainerData
4440
from openedx_events.content_authoring.signals import (
4541
LIBRARY_BLOCK_CREATED,
4642
LIBRARY_BLOCK_DELETED,
47-
LIBRARY_BLOCK_UPDATED,
4843
LIBRARY_BLOCK_PUBLISHED,
44+
LIBRARY_BLOCK_UPDATED,
4945
LIBRARY_COLLECTION_UPDATED,
5046
LIBRARY_CONTAINER_CREATED,
5147
LIBRARY_CONTAINER_DELETED,
52-
LIBRARY_CONTAINER_UPDATED,
5348
LIBRARY_CONTAINER_PUBLISHED,
49+
LIBRARY_CONTAINER_UPDATED
5450
)
55-
51+
from openedx_learning.api import authoring as authoring_api
52+
from openedx_learning.api.authoring import create_zip_file as create_lib_zip_file
53+
from openedx_learning.api.authoring_models import DraftChangeLog, PublishLog
54+
from path import Path
5655
from user_tasks.models import UserTaskArtifact
5756
from user_tasks.tasks import UserTask, UserTaskStatus
5857
from xblock.fields import Scope

0 commit comments

Comments
 (0)