refactor: normalize xmodule imports

Code in ./common/lib/xmodule/xmodule should
be imported as `from xmodule`, since `xmodule`
is a locally-installed package.

This is weird, but as long as it is the case,
we should be consistent.

(In BOM-2584, I propose moving the files to
 ./xmodule, which would quell this confusion.)
This commit is contained in:
Kyle McCormick
2021-03-14 20:28:25 -04:00
committed by Kyle McCormick
parent 3ef905c79b
commit d42b0c401d
13 changed files with 16 additions and 16 deletions

View File

@@ -1,13 +1,13 @@
# lint-amnesty, pylint: disable=missing-module-docstring
import logging
from common.lib.xmodule.xmodule.partitions.enrollment_track_partition_generator import (
from xmodule.partitions.enrollment_track_partition_generator import (
create_enrollment_track_partition_with_course_id
)
from common.lib.xmodule.xmodule.partitions.partitions import (
from xmodule.partitions.partitions import (
ENROLLMENT_TRACK_PARTITION_ID,
)
from common.lib.xmodule.xmodule.partitions.partitions_service import get_user_partition_groups
from xmodule.partitions.partitions_service import get_user_partition_groups
from .base import OutlineProcessor

View File

@@ -24,7 +24,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
from common.lib.xmodule.xmodule.partitions.partitions import (
from xmodule.partitions.partitions import (
ENROLLMENT_TRACK_PARTITION_ID,
)

View File

@@ -6,7 +6,7 @@ import logging
from django.dispatch import receiver
from edx_when.api import FIELDS_TO_EXTRACT, set_dates_for_course
from common.lib.xmodule.xmodule.util.misc import is_xblock_an_assignment
from xmodule.util.misc import is_xblock_an_assignment
from openedx.core.lib.graph_traversals import get_children, leaf_filter, traverse_pre_order
from xblock.fields import Scope # lint-amnesty, pylint: disable=wrong-import-order
from xmodule.modulestore import ModuleStoreEnum

View File

@@ -11,8 +11,8 @@ from django.urls import reverse
from rest_framework import status
from rest_framework.test import APITestCase
from common.lib.xmodule.xmodule.modulestore.tests.django_utils import CourseUserType
from common.lib.xmodule.xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
from xmodule.modulestore.tests.django_utils import CourseUserType
from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
from xmodule.modulestore import ModuleStoreEnum
from xmodule.modulestore.tests.factories import CourseFactory