From 097613e8b9cbc0dfd8ebb4c0b9ac0a72095c715e Mon Sep 17 00:00:00 2001 From: Jawayria Date: Fri, 12 Feb 2021 19:17:17 +0500 Subject: [PATCH] BOM-2351: Removed unused imports from common/lib/xmodule --- common/lib/xmodule/xmodule/course_module.py | 4 +--- .../xmodule/modulestore/split_mongo/mongo_connection.py | 1 - common/lib/xmodule/xmodule/modulestore/tests/factories.py | 3 +-- .../xmodule/modulestore/tests/test_mongo_call_count.py | 2 +- common/lib/xmodule/xmodule/modulestore/xml.py | 2 -- common/lib/xmodule/xmodule/mongo_utils.py | 1 - common/lib/xmodule/xmodule/partitions/partitions_service.py | 2 -- .../lib/xmodule/xmodule/partitions/tests/test_partitions.py | 2 +- common/lib/xmodule/xmodule/poll_module.py | 2 -- common/lib/xmodule/xmodule/seq_module.py | 2 -- common/lib/xmodule/xmodule/template_module.py | 2 +- common/lib/xmodule/xmodule/tests/test_annotatable_module.py | 1 - .../lib/xmodule/xmodule/tests/test_library_sourced_block.py | 4 +--- common/lib/xmodule/xmodule/tests/test_sequence.py | 1 - common/lib/xmodule/xmodule/xml_module.py | 2 +- 15 files changed, 7 insertions(+), 24 deletions(-) diff --git a/common/lib/xmodule/xmodule/course_module.py b/common/lib/xmodule/xmodule/course_module.py index aaf901e785..258ed0c018 100644 --- a/common/lib/xmodule/xmodule/course_module.py +++ b/common/lib/xmodule/xmodule/course_module.py @@ -19,11 +19,9 @@ from path import Path as path from pytz import utc from six import text_type from xblock.fields import Boolean, Dict, Float, Integer, List, Scope, String - -from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers # lint-amnesty, pylint: disable=unused-import from openedx.core.djangoapps.video_pipeline.models import VideoUploadsEnabledByDefault from openedx.core.lib.license import LicenseMixin -from openedx.core.lib.teams_config import TeamsConfig, DEFAULT_COURSE_RUN_MAX_TEAM_SIZE # lint-amnesty, pylint: disable=unused-import +from openedx.core.lib.teams_config import TeamsConfig # lint-amnesty, pylint: disable=unused-import from xmodule import course_metadata_utils from xmodule.course_metadata_utils import DEFAULT_GRADING_POLICY, DEFAULT_START_DATE from xmodule.graders import grader_from_conf diff --git a/common/lib/xmodule/xmodule/modulestore/split_mongo/mongo_connection.py b/common/lib/xmodule/xmodule/modulestore/split_mongo/mongo_connection.py index aaaa1037d1..e3ba02a302 100644 --- a/common/lib/xmodule/xmodule/modulestore/split_mongo/mongo_connection.py +++ b/common/lib/xmodule/xmodule/modulestore/split_mongo/mongo_connection.py @@ -19,7 +19,6 @@ from contracts import check, new_contract from mongodb_proxy import autoretry_read # Import this just to export it from pymongo.errors import DuplicateKeyError # pylint: disable=unused-import - from xmodule.exceptions import HeartbeatFailure from xmodule.modulestore import BlockData from xmodule.modulestore.split_mongo import BlockKey diff --git a/common/lib/xmodule/xmodule/modulestore/tests/factories.py b/common/lib/xmodule/xmodule/modulestore/tests/factories.py index 56ea6cf276..37675dd84f 100644 --- a/common/lib/xmodule/xmodule/modulestore/tests/factories.py +++ b/common/lib/xmodule/xmodule/modulestore/tests/factories.py @@ -11,9 +11,9 @@ import traceback from collections import defaultdict from contextlib import contextmanager from uuid import uuid4 +import pytz import pymongo.message -import pytz import six from factory import Factory, Sequence, lazy_attribute, lazy_attribute_sequence from factory.errors import CyclicDefinitionError @@ -26,7 +26,6 @@ from xmodule.course_module import Textbook from xmodule.modulestore import ModuleStoreEnum, prefer_xmodules from xmodule.modulestore.tests.sample_courses import TOY_BLOCK_INFO_TREE, default_block_info_tree from xmodule.tabs import CourseTab -from xmodule.x_module import DEPRECATION_VSCOMPAT_EVENT # lint-amnesty, pylint: disable=unused-import LOG = logging.getLogger(__name__) diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_mongo_call_count.py b/common/lib/xmodule/xmodule/modulestore/tests/test_mongo_call_count.py index deb0b78a54..c939147a7f 100644 --- a/common/lib/xmodule/xmodule/modulestore/tests/test_mongo_call_count.py +++ b/common/lib/xmodule/xmodule/modulestore/tests/test_mongo_call_count.py @@ -6,7 +6,7 @@ when using the Split modulestore. from shutil import rmtree from tempfile import mkdtemp -from unittest import TestCase, skip +from unittest import skip import ddt import six diff --git a/common/lib/xmodule/xmodule/modulestore/xml.py b/common/lib/xmodule/xmodule/modulestore/xml.py index 7befc78f3b..b37279b0c1 100644 --- a/common/lib/xmodule/xmodule/modulestore/xml.py +++ b/common/lib/xmodule/xmodule/modulestore/xml.py @@ -1,6 +1,5 @@ # lint-amnesty, pylint: disable=missing-module-docstring -import codecs # lint-amnesty, pylint: disable=unused-import import glob import hashlib import io @@ -34,7 +33,6 @@ from xmodule.modulestore import COURSE_ROOT, LIBRARY_ROOT, ModuleStoreEnum, Modu from xmodule.modulestore.xml_exporter import DEFAULT_CONTENT_FIELDS from xmodule.tabs import CourseTabList from xmodule.x_module import ( # lint-amnesty, pylint: disable=unused-import - DEPRECATION_VSCOMPAT_EVENT, AsideKeyGenerator, OpaqueKeyReader, XMLParsingSystem, diff --git a/common/lib/xmodule/xmodule/mongo_utils.py b/common/lib/xmodule/xmodule/mongo_utils.py index 93b1a40575..e2f08982f7 100644 --- a/common/lib/xmodule/xmodule/mongo_utils.py +++ b/common/lib/xmodule/xmodule/mongo_utils.py @@ -9,7 +9,6 @@ import pymongo from mongodb_proxy import MongoProxy from pymongo.read_preferences import ( # lint-amnesty, pylint: disable=unused-import ReadPreference, - read_pref_mode_from_name, _MONGOS_MODES, _MODES ) diff --git a/common/lib/xmodule/xmodule/partitions/partitions_service.py b/common/lib/xmodule/xmodule/partitions/partitions_service.py index 62fc4a2807..df03e21583 100644 --- a/common/lib/xmodule/xmodule/partitions/partitions_service.py +++ b/common/lib/xmodule/xmodule/partitions/partitions_service.py @@ -6,8 +6,6 @@ persist the assignments. import logging - -import six # lint-amnesty, pylint: disable=unused-import from django.conf import settings from openedx.core.lib.cache_utils import request_cached diff --git a/common/lib/xmodule/xmodule/partitions/tests/test_partitions.py b/common/lib/xmodule/xmodule/partitions/tests/test_partitions.py index 804759dd5f..be5a1428e7 100644 --- a/common/lib/xmodule/xmodule/partitions/tests/test_partitions.py +++ b/common/lib/xmodule/xmodule/partitions/tests/test_partitions.py @@ -9,7 +9,7 @@ from datetime import datetime import pytest import six from django.test import TestCase -from mock import Mock, patch # lint-amnesty, pylint: disable=unused-import +from mock import Mock # lint-amnesty, pylint: disable=unused-import from opaque_keys.edx.locator import CourseLocator from stevedore.extension import Extension, ExtensionManager diff --git a/common/lib/xmodule/xmodule/poll_module.py b/common/lib/xmodule/xmodule/poll_module.py index 21f8d64509..519ee5280e 100644 --- a/common/lib/xmodule/xmodule/poll_module.py +++ b/common/lib/xmodule/xmodule/poll_module.py @@ -14,8 +14,6 @@ from collections import OrderedDict from copy import deepcopy from pkg_resources import resource_string - -import six # lint-amnesty, pylint: disable=unused-import from lxml import etree from openedx.core.djangolib.markup import Text, HTML from xblock.fields import Boolean, Dict, List, Scope, String # lint-amnesty, pylint: disable=wrong-import-order diff --git a/common/lib/xmodule/xmodule/seq_module.py b/common/lib/xmodule/xmodule/seq_module.py index 2b684a1b5b..edec43fdcd 100644 --- a/common/lib/xmodule/xmodule/seq_module.py +++ b/common/lib/xmodule/xmodule/seq_module.py @@ -12,7 +12,6 @@ from datetime import datetime from functools import reduce import six -from django.contrib.auth import get_user_model from lxml import etree from opaque_keys.edx.keys import UsageKey from pkg_resources import resource_string @@ -25,7 +24,6 @@ from xblock.exceptions import NoSuchServiceError from xblock.fields import Boolean, Integer, List, Scope, String from edx_toggles.toggles import LegacyWaffleFlag -from edx_toggles.toggles import WaffleFlag # lint-amnesty, pylint: disable=unused-import from lms.djangoapps.courseware.toggles import COURSEWARE_PROCTORING_IMPROVEMENTS from .exceptions import NotFoundError diff --git a/common/lib/xmodule/xmodule/template_module.py b/common/lib/xmodule/xmodule/template_module.py index 6acb400246..d53856a2a9 100644 --- a/common/lib/xmodule/xmodule/template_module.py +++ b/common/lib/xmodule/xmodule/template_module.py @@ -6,7 +6,7 @@ from string import Template from lxml import etree from xmodule.raw_module import RawDescriptor -from xmodule.x_module import DEPRECATION_VSCOMPAT_EVENT, XModule # lint-amnesty, pylint: disable=unused-import +from xmodule.x_module import XModule # lint-amnesty, pylint: disable=unused-import class CustomTagModule(XModule): diff --git a/common/lib/xmodule/xmodule/tests/test_annotatable_module.py b/common/lib/xmodule/xmodule/tests/test_annotatable_module.py index b0ca0d9853..c7e909f111 100644 --- a/common/lib/xmodule/xmodule/tests/test_annotatable_module.py +++ b/common/lib/xmodule/xmodule/tests/test_annotatable_module.py @@ -4,7 +4,6 @@ import unittest from lxml import etree -from mock import Mock # lint-amnesty, pylint: disable=unused-import from opaque_keys.edx.locator import BlockUsageLocator, CourseLocator from xblock.field_data import DictFieldData from xblock.fields import ScopeIds diff --git a/common/lib/xmodule/xmodule/tests/test_library_sourced_block.py b/common/lib/xmodule/xmodule/tests/test_library_sourced_block.py index 710379c394..b60d637a03 100644 --- a/common/lib/xmodule/xmodule/tests/test_library_sourced_block.py +++ b/common/lib/xmodule/xmodule/tests/test_library_sourced_block.py @@ -1,15 +1,13 @@ """ Tests for Source from Library XBlock """ -from xblockutils.resources import ResourceLoader # lint-amnesty, pylint: disable=unused-import from openedx.core.djangoapps.content_libraries.tests.base import ContentLibrariesRestApiTest from common.djangoapps.student.roles import CourseInstructorRole -from cms.lib.xblock.runtime import handler_url # lint-amnesty, pylint: disable=unused-import from xmodule.modulestore.django import modulestore from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory from xmodule.tests import get_test_system -from xmodule.x_module import AUTHOR_VIEW, STUDENT_VIEW # lint-amnesty, pylint: disable=unused-import +from xmodule.x_module import STUDENT_VIEW # lint-amnesty, pylint: disable=unused-import class LibrarySourcedBlockTestCase(ContentLibrariesRestApiTest): diff --git a/common/lib/xmodule/xmodule/tests/test_sequence.py b/common/lib/xmodule/xmodule/tests/test_sequence.py index 0533cbcb71..bd5c9451fb 100644 --- a/common/lib/xmodule/xmodule/tests/test_sequence.py +++ b/common/lib/xmodule/xmodule/tests/test_sequence.py @@ -18,7 +18,6 @@ from six.moves import range from web_fragments.fragment import Fragment from edx_toggles.toggles.testutils import override_waffle_flag -from common.djangoapps.student.tests.factories import UserFactory from openedx.features.content_type_gating.models import ContentTypeGatingConfig from xmodule.seq_module import TIMED_EXAM_GATING_WAFFLE_FLAG, SequenceModule from xmodule.tests import get_test_system diff --git a/common/lib/xmodule/xmodule/xml_module.py b/common/lib/xmodule/xmodule/xml_module.py index 13affa6ecd..3ff5997edb 100644 --- a/common/lib/xmodule/xmodule/xml_module.py +++ b/common/lib/xmodule/xmodule/xml_module.py @@ -14,7 +14,7 @@ from xblock.fields import Dict, Scope, ScopeIds from xblock.runtime import KvsFieldData from xmodule.modulestore import EdxJSONEncoder from xmodule.modulestore.inheritance import InheritanceKeyValueStore, own_metadata -from xmodule.x_module import DEPRECATION_VSCOMPAT_EVENT, XModuleDescriptor # lint-amnesty, pylint: disable=unused-import +from xmodule.x_module import XModuleDescriptor # lint-amnesty, pylint: disable=unused-import log = logging.getLogger(__name__)