From 959b6cef6c984d0e6384110eaf5db3d94ce0c512 Mon Sep 17 00:00:00 2001 From: Jawayria Date: Wed, 24 Nov 2021 18:28:25 +0500 Subject: [PATCH] chore: Applied lint-amnesty on openedx/core/djangoapps/content --- .../commands/generate_course_blocks.py | 2 +- .../tests/test_generate_course_blocks.py | 4 ++-- .../content/block_structure/tasks.py | 2 +- .../management/commands/simulate_publish.py | 2 +- .../tests/test_generate_course_overview.py | 4 ++-- .../commands/tests/test_simulate_publish.py | 8 ++++---- .../content/course_overviews/models.py | 10 +++++----- .../content/course_overviews/signals.py | 2 +- .../content/course_overviews/tasks.py | 2 +- .../course_overviews/tests/test_api.py | 2 +- .../tests/test_course_overviews.py | 20 +++++++++---------- .../enrollment_track_partition_groups.py | 8 ++++---- .../api/tests/test_outlines.py | 2 +- 13 files changed, 34 insertions(+), 34 deletions(-) diff --git a/openedx/core/djangoapps/content/block_structure/management/commands/generate_course_blocks.py b/openedx/core/djangoapps/content/block_structure/management/commands/generate_course_blocks.py index bed9921cd3..4da85f5c52 100644 --- a/openedx/core/djangoapps/content/block_structure/management/commands/generate_course_blocks.py +++ b/openedx/core/djangoapps/content/block_structure/management/commands/generate_course_blocks.py @@ -16,7 +16,7 @@ from openedx.core.lib.command_utils import ( parse_course_keys, validate_dependent_option ) -from xmodule.modulestore.django import modulestore +from xmodule.modulestore.django import modulestore # lint-amnesty, pylint: disable=wrong-import-order log = logging.getLogger(__name__) diff --git a/openedx/core/djangoapps/content/block_structure/management/commands/tests/test_generate_course_blocks.py b/openedx/core/djangoapps/content/block_structure/management/commands/tests/test_generate_course_blocks.py index 232fe278c7..5b08c5e95d 100644 --- a/openedx/core/djangoapps/content/block_structure/management/commands/tests/test_generate_course_blocks.py +++ b/openedx/core/djangoapps/content/block_structure/management/commands/tests/test_generate_course_blocks.py @@ -13,8 +13,8 @@ from openedx.core.djangoapps.content.block_structure.tests.helpers import ( is_course_in_block_structure_cache, is_course_in_block_structure_storage ) -from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase -from xmodule.modulestore.tests.factories import CourseFactory +from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase # lint-amnesty, pylint: disable=wrong-import-order +from xmodule.modulestore.tests.factories import CourseFactory # lint-amnesty, pylint: disable=wrong-import-order from .. import generate_course_blocks diff --git a/openedx/core/djangoapps/content/block_structure/tasks.py b/openedx/core/djangoapps/content/block_structure/tasks.py index 80e0f37ac0..30628ebe00 100644 --- a/openedx/core/djangoapps/content/block_structure/tasks.py +++ b/openedx/core/djangoapps/content/block_structure/tasks.py @@ -15,7 +15,7 @@ from opaque_keys.edx.keys import CourseKey from capa.responsetypes import LoncapaProblemError from openedx.core.djangoapps.content.block_structure import api from openedx.core.djangoapps.content.block_structure.config import enable_storage_backing_for_cache_in_request -from xmodule.modulestore.exceptions import ItemNotFoundError +from xmodule.modulestore.exceptions import ItemNotFoundError # lint-amnesty, pylint: disable=wrong-import-order log = logging.getLogger('edx.celery.task') diff --git a/openedx/core/djangoapps/content/course_overviews/management/commands/simulate_publish.py b/openedx/core/djangoapps/content/course_overviews/management/commands/simulate_publish.py index 658da2b7be..177fb8f31f 100644 --- a/openedx/core/djangoapps/content/course_overviews/management/commands/simulate_publish.py +++ b/openedx/core/djangoapps/content/course_overviews/management/commands/simulate_publish.py @@ -25,7 +25,7 @@ from opaque_keys import InvalidKeyError from opaque_keys.edx.keys import CourseKey from openedx.core.djangoapps.content.course_overviews.models import SimulateCoursePublishConfig from lms.djangoapps.ccx.tasks import course_published_handler as ccx_receiver_fn -from xmodule.modulestore.django import SignalHandler, modulestore +from xmodule.modulestore.django import SignalHandler, modulestore # lint-amnesty, pylint: disable=wrong-import-order log = logging.getLogger('simulate_publish') diff --git a/openedx/core/djangoapps/content/course_overviews/management/commands/tests/test_generate_course_overview.py b/openedx/core/djangoapps/content/course_overviews/management/commands/tests/test_generate_course_overview.py index b9154dc2a0..87bc5e4323 100644 --- a/openedx/core/djangoapps/content/course_overviews/management/commands/tests/test_generate_course_overview.py +++ b/openedx/core/djangoapps/content/course_overviews/management/commands/tests/test_generate_course_overview.py @@ -8,8 +8,8 @@ from django.core.management.base import CommandError from openedx.core.djangoapps.content.course_overviews.management.commands import generate_course_overview from openedx.core.djangoapps.content.course_overviews.models import CourseOverview -from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase -from xmodule.modulestore.tests.factories import CourseFactory +from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase # lint-amnesty, pylint: disable=wrong-import-order +from xmodule.modulestore.tests.factories import CourseFactory # lint-amnesty, pylint: disable=wrong-import-order class TestGenerateCourseOverview(ModuleStoreTestCase): diff --git a/openedx/core/djangoapps/content/course_overviews/management/commands/tests/test_simulate_publish.py b/openedx/core/djangoapps/content/course_overviews/management/commands/tests/test_simulate_publish.py index c0b0de2f25..411b367bce 100644 --- a/openedx/core/djangoapps/content/course_overviews/management/commands/tests/test_simulate_publish.py +++ b/openedx/core/djangoapps/content/course_overviews/management/commands/tests/test_simulate_publish.py @@ -9,10 +9,10 @@ import lms.djangoapps.ccx.tasks import openedx.core.djangoapps.content.course_overviews.signals from openedx.core.djangoapps.content.course_overviews.management.commands.simulate_publish import Command, name_from_fn from openedx.core.djangoapps.content.course_overviews.models import CourseOverview, SimulateCoursePublishConfig -from xmodule.modulestore import ModuleStoreEnum -from xmodule.modulestore.django import SwitchedSignal -from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase -from xmodule.modulestore.tests.factories import CourseFactory +from xmodule.modulestore import ModuleStoreEnum # lint-amnesty, pylint: disable=wrong-import-order +from xmodule.modulestore.django import SwitchedSignal # lint-amnesty, pylint: disable=wrong-import-order +from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase # lint-amnesty, pylint: disable=wrong-import-order +from xmodule.modulestore.tests.factories import CourseFactory # lint-amnesty, pylint: disable=wrong-import-order LOGGER_NAME = 'simulate_publish' diff --git a/openedx/core/djangoapps/content/course_overviews/models.py b/openedx/core/djangoapps/content/course_overviews/models.py index f5a09e9756..09ad1eec10 100644 --- a/openedx/core/djangoapps/content/course_overviews/models.py +++ b/openedx/core/djangoapps/content/course_overviews/models.py @@ -30,11 +30,11 @@ from openedx.core.djangoapps.lang_pref.api import get_closest_released_language from openedx.core.djangoapps.models.course_details import CourseDetails from openedx.core.lib.cache_utils import request_cached, RequestCache from common.djangoapps.static_replace.models import AssetBaseUrlConfig -from xmodule import block_metadata_utils, course_metadata_utils -from xmodule.course_module import DEFAULT_START_DATE, CourseBlock -from xmodule.error_module import ErrorBlock -from xmodule.modulestore.django import modulestore -from xmodule.tabs import CourseTab +from xmodule import block_metadata_utils, course_metadata_utils # lint-amnesty, pylint: disable=wrong-import-order +from xmodule.course_module import DEFAULT_START_DATE, CourseBlock # lint-amnesty, pylint: disable=wrong-import-order +from xmodule.error_module import ErrorBlock # lint-amnesty, pylint: disable=wrong-import-order +from xmodule.modulestore.django import modulestore # lint-amnesty, pylint: disable=wrong-import-order +from xmodule.tabs import CourseTab # lint-amnesty, pylint: disable=wrong-import-order log = logging.getLogger(__name__) diff --git a/openedx/core/djangoapps/content/course_overviews/signals.py b/openedx/core/djangoapps/content/course_overviews/signals.py index 1f691c2383..e0d59ab6fd 100644 --- a/openedx/core/djangoapps/content/course_overviews/signals.py +++ b/openedx/core/djangoapps/content/course_overviews/signals.py @@ -9,7 +9,7 @@ from django.dispatch import Signal from django.dispatch.dispatcher import receiver from openedx.core.djangoapps.signals.signals import COURSE_CERT_DATE_CHANGE -from xmodule.modulestore.django import SignalHandler +from xmodule.modulestore.django import SignalHandler # lint-amnesty, pylint: disable=wrong-import-order from .models import CourseOverview diff --git a/openedx/core/djangoapps/content/course_overviews/tasks.py b/openedx/core/djangoapps/content/course_overviews/tasks.py index 03f839f4b6..4cdf1cd6ef 100644 --- a/openedx/core/djangoapps/content/course_overviews/tasks.py +++ b/openedx/core/djangoapps/content/course_overviews/tasks.py @@ -9,7 +9,7 @@ from edx_django_utils.monitoring import set_code_owner_attribute from opaque_keys.edx.keys import CourseKey from openedx.core.djangoapps.content.course_overviews.models import CourseOverview -from xmodule.modulestore.django import modulestore +from xmodule.modulestore.django import modulestore # lint-amnesty, pylint: disable=wrong-import-order log = logging.getLogger(__name__) diff --git a/openedx/core/djangoapps/content/course_overviews/tests/test_api.py b/openedx/core/djangoapps/content/course_overviews/tests/test_api.py index 9277750295..6c04e4a47c 100644 --- a/openedx/core/djangoapps/content/course_overviews/tests/test_api.py +++ b/openedx/core/djangoapps/content/course_overviews/tests/test_api.py @@ -16,7 +16,7 @@ from openedx.core.djangoapps.content.course_overviews.api import ( get_pseudo_course_overview, ) from openedx.core.djangoapps.content.course_overviews.tests.factories import CourseOverviewFactory -from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase +from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase # lint-amnesty, pylint: disable=wrong-import-order class TestCourseOverviewsApi(ModuleStoreTestCase): diff --git a/openedx/core/djangoapps/content/course_overviews/tests/test_course_overviews.py b/openedx/core/djangoapps/content/course_overviews/tests/test_course_overviews.py index 39b30bd417..04ed90de15 100644 --- a/openedx/core/djangoapps/content/course_overviews/tests/test_course_overviews.py +++ b/openedx/core/djangoapps/content/course_overviews/tests/test_course_overviews.py @@ -24,20 +24,20 @@ from openedx.core.djangoapps.models.course_details import CourseDetails from openedx.core.djangolib.testing.utils import CacheIsolationTestCase from openedx.core.lib.courses import course_image_url from common.djangoapps.static_replace.models import AssetBaseUrlConfig -from xmodule.assetstore.assetmgr import AssetManager -from xmodule.contentstore.content import StaticContent -from xmodule.contentstore.django import contentstore -from xmodule.course_metadata_utils import DEFAULT_START_DATE -from xmodule.course_module import ( +from xmodule.assetstore.assetmgr import AssetManager # lint-amnesty, pylint: disable=wrong-import-order +from xmodule.contentstore.content import StaticContent # lint-amnesty, pylint: disable=wrong-import-order +from xmodule.contentstore.django import contentstore # lint-amnesty, pylint: disable=wrong-import-order +from xmodule.course_metadata_utils import DEFAULT_START_DATE # lint-amnesty, pylint: disable=wrong-import-order +from xmodule.course_module import ( # lint-amnesty, pylint: disable=wrong-import-order CATALOG_VISIBILITY_ABOUT, CATALOG_VISIBILITY_CATALOG_AND_ABOUT, CATALOG_VISIBILITY_NONE ) -from xmodule.error_module import ErrorBlock -from xmodule.modulestore import ModuleStoreEnum -from xmodule.modulestore.django import modulestore -from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase -from xmodule.modulestore.tests.factories import CourseFactory, check_mongo_calls_range +from xmodule.error_module import ErrorBlock # lint-amnesty, pylint: disable=wrong-import-order +from xmodule.modulestore import ModuleStoreEnum # lint-amnesty, pylint: disable=wrong-import-order +from xmodule.modulestore.django import modulestore # lint-amnesty, pylint: disable=wrong-import-order +from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase # lint-amnesty, pylint: disable=wrong-import-order +from xmodule.modulestore.tests.factories import CourseFactory, check_mongo_calls_range # lint-amnesty, pylint: disable=wrong-import-order from ..models import CourseOverview, CourseOverviewImageConfig, CourseOverviewImageSet, CourseOverviewTab from .factories import CourseOverviewFactory diff --git a/openedx/core/djangoapps/content/learning_sequences/api/processors/enrollment_track_partition_groups.py b/openedx/core/djangoapps/content/learning_sequences/api/processors/enrollment_track_partition_groups.py index c54d15bf53..ec7c29f953 100644 --- a/openedx/core/djangoapps/content/learning_sequences/api/processors/enrollment_track_partition_groups.py +++ b/openedx/core/djangoapps/content/learning_sequences/api/processors/enrollment_track_partition_groups.py @@ -6,14 +6,14 @@ from typing import Dict from opaque_keys.edx.keys import CourseKey from openedx.core import types -from xmodule.partitions.enrollment_track_partition_generator import ( +from xmodule.partitions.enrollment_track_partition_generator import ( # lint-amnesty, pylint: disable=wrong-import-order create_enrollment_track_partition_with_course_id ) -from xmodule.partitions.partitions import ( +from xmodule.partitions.partitions import ( # lint-amnesty, pylint: disable=wrong-import-order ENROLLMENT_TRACK_PARTITION_ID, ) -from xmodule.partitions.partitions_service import get_user_partition_groups -from xmodule.partitions.partitions import Group +from xmodule.partitions.partitions_service import get_user_partition_groups # lint-amnesty, pylint: disable=wrong-import-order +from xmodule.partitions.partitions import Group # lint-amnesty, pylint: disable=wrong-import-order from .base import OutlineProcessor diff --git a/openedx/core/djangoapps/content/learning_sequences/api/tests/test_outlines.py b/openedx/core/djangoapps/content/learning_sequences/api/tests/test_outlines.py index bd3080b3fc..476c98b0e9 100644 --- a/openedx/core/djangoapps/content/learning_sequences/api/tests/test_outlines.py +++ b/openedx/core/djangoapps/content/learning_sequences/api/tests/test_outlines.py @@ -26,7 +26,7 @@ from common.djangoapps.course_modes.signals import update_masters_access_course from common.djangoapps.student.auth import user_has_role from common.djangoapps.student.roles import CourseBetaTesterRole from common.djangoapps.student.tests.factories import BetaTesterFactory, UserFactory -from xmodule.partitions.partitions import ( +from xmodule.partitions.partitions import ( # lint-amnesty, pylint: disable=wrong-import-order ENROLLMENT_TRACK_PARTITION_ID, )