Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #21581 from edx/nedbat/fix-courseware-warning

Browse Source 
Finally import courseware properly everywhere to get rid of a warning
This commit is contained in:
Ned Batchelder
2019-09-26 14:25:27 -04:00
committed by GitHub
parent 4babc5ee1c bcc09a0148
commit b3845b2b96
226 changed files with 438 additions and 414 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
openedx/core/djangoapps/content_libraries/tests/test_runtime.py
View File

@@ -13,7 +13,7 @@ from rest_framework.test import APIClient
from xblock.core import XBlock, Scope
from xblock import fields
from courseware.model_data import get_score
from lms.djangoapps.courseware.model_data import get_score
from openedx.core.djangoapps.content_libraries import api as library_api
from openedx.core.djangoapps.content_libraries.tests.test_content_libraries import (
URL_BLOCK_RENDER_VIEW,

2
openedx/core/djangoapps/course_groups/cohorts.py
View File

@@ -20,7 +20,7 @@ from django.utils.translation import ugettext as _
from edx_django_utils.cache import RequestCache
from eventtracking import tracker
from courseware import courses
from lms.djangoapps.courseware import courses
from openedx.core.lib.cache_utils import request_cached
from student.models import get_user_by_username_or_email

2
openedx/core/djangoapps/course_groups/partition_scheme.py
View File

@@ -5,7 +5,7 @@ from __future__ import absolute_import
import logging
from courseware.masquerade import (
from lms.djangoapps.courseware.masquerade import (
get_course_masquerade,
get_masquerading_user_group,
is_masquerading_as_specific_student

2
openedx/core/djangoapps/course_groups/tests/test_partition_scheme.py
View File

@@ -8,7 +8,7 @@ import django.test
from mock import patch
from six.moves import range
from courseware.tests.test_masquerade import StaffMasqueradeTestCase
from lms.djangoapps.courseware.tests.test_masquerade import StaffMasqueradeTestCase
from openedx.core.djangoapps.user_api.partition_schemes import RandomUserPartitionScheme
from openedx.core.djangolib.testing.utils import skip_unless_lms
from student.tests.factories import UserFactory

2
openedx/core/djangoapps/course_groups/views.py
View File

@@ -26,7 +26,7 @@ from rest_framework.generics import GenericAPIView
from rest_framework.response import Response
from rest_framework.serializers import Serializer
from courseware.courses import get_course, get_course_with_access
from lms.djangoapps.courseware.courses import get_course, get_course_with_access
from edxmako.shortcuts import render_to_response
from openedx.core.djangoapps.course_groups.models import CohortMembership
from openedx.core.lib.api.authentication import OAuth2AuthenticationAllowInactiveUser

2
openedx/core/djangoapps/enrollments/permissions.py
View File

@@ -3,7 +3,7 @@ Permission definitions for the enrollments djangoapp
"""
from bridgekeeper import perms
from courseware.rules import HasAccessRule
from lms.djangoapps.courseware.rules import HasAccessRule
ENROLL_IN_COURSE = 'enrollment.enroll_in_course'

4
openedx/core/djangoapps/schedules/content_highlights.py
View File

@@ -6,8 +6,8 @@ from __future__ import absolute_import
import logging
from courseware.model_data import FieldDataCache
from courseware.module_render import get_module_for_descriptor
from lms.djangoapps.courseware.model_data import FieldDataCache
from lms.djangoapps.courseware.module_render import get_module_for_descriptor
from openedx.core.djangoapps.schedules.config import COURSE_UPDATE_WAFFLE_FLAG
from openedx.core.djangoapps.schedules.exceptions import CourseUpdateDoesNotExist
from openedx.core.lib.request_utils import get_request_or_stub

2
openedx/core/djangoapps/schedules/management/commands/tests/send_email_base.py
View File

@@ -24,7 +24,7 @@ from six.moves import range
from course_modes.models import CourseMode
from course_modes.tests.factories import CourseModeFactory
from courseware.models import DynamicUpgradeDeadlineConfiguration
from lms.djangoapps.courseware.models import DynamicUpgradeDeadlineConfiguration
from lms.djangoapps.commerce.models import CommerceConfiguration
from openedx.core.djangoapps.schedules import resolvers, tasks
from openedx.core.djangoapps.schedules.resolvers import _get_datetime_beginning_of_day

2
openedx/core/djangoapps/schedules/management/commands/tests/upsell_base.py
View File

@@ -13,7 +13,7 @@ from edx_ace.utils.date import serialize
from freezegun import freeze_time
from mock import PropertyMock, patch
from courseware.models import DynamicUpgradeDeadlineConfiguration
from lms.djangoapps.courseware.models import DynamicUpgradeDeadlineConfiguration
@ddt.ddt

2
openedx/core/djangoapps/schedules/resolvers.py
View File

@@ -14,7 +14,7 @@ from edx_ace.recipient import Recipient
from edx_ace.recipient_resolver import RecipientResolver
from edx_django_utils.monitoring import function_trace, set_custom_metric
from courseware.date_summary import verified_upgrade_deadline_link, verified_upgrade_link_is_valid
from lms.djangoapps.courseware.date_summary import verified_upgrade_deadline_link, verified_upgrade_link_is_valid
from openedx.core.djangoapps.ace_common.template_context import get_base_template_context
from openedx.core.djangoapps.schedules.content_highlights import get_week_highlights
from openedx.core.djangoapps.schedules.exceptions import CourseUpdateDoesNotExist

2
openedx/core/djangoapps/schedules/signals.py
View File

@@ -10,7 +10,7 @@ from django.dispatch import receiver
from edx_ace.utils import date
from course_modes.models import CourseMode
from courseware.models import (
from lms.djangoapps.courseware.models import (
CourseDynamicUpgradeDeadlineConfiguration,
DynamicUpgradeDeadlineConfiguration,
OrgDynamicUpgradeDeadlineConfiguration

2
openedx/core/djangoapps/schedules/tests/test_signals.py
View File

@@ -12,7 +12,7 @@ from pytz import utc
from course_modes.models import CourseMode
from course_modes.tests.factories import CourseModeFactory
from courseware.models import DynamicUpgradeDeadlineConfiguration
from lms.djangoapps.courseware.models import DynamicUpgradeDeadlineConfiguration
from openedx.core.djangoapps.schedules.models import ScheduleExperience
from openedx.core.djangoapps.schedules.signals import CREATE_SCHEDULE_WAFFLE_FLAG
from openedx.core.djangoapps.site_configuration.tests.factories import SiteFactory

2
openedx/core/djangoapps/theming/tests/test_views.py
View File

@@ -9,7 +9,7 @@ from django.contrib.messages.middleware import MessageMiddleware
from django.contrib.sites.models import Site
from django.test import TestCase
from courseware.tests.factories import GlobalStaffFactory
from lms.djangoapps.courseware.tests.factories import GlobalStaffFactory
from openedx.core.djangoapps.theming.middleware import CurrentSiteThemeMiddleware
from student.tests.factories import UserFactory

2
openedx/core/djangoapps/verified_track_content/partition_scheme.py
View File

@@ -7,7 +7,7 @@ import logging
import six
from course_modes.models import CourseMode
from courseware.masquerade import (
from lms.djangoapps.courseware.masquerade import (
get_course_masquerade,
get_masquerading_user_group,
is_masquerading_as_specific_student

2
openedx/core/djangoapps/xblock/runtime/runtime.py
View File

@@ -18,7 +18,7 @@ from xblock.fields import Scope
from xblock.runtime import DictKeyValueStore, KvsFieldData, NullI18nService, MemoryIdManager, Runtime
from web_fragments.fragment import Fragment
from courseware.model_data import DjangoKeyValueStore, FieldDataCache
from lms.djangoapps.courseware.model_data import DjangoKeyValueStore, FieldDataCache
from lms.djangoapps.grades.api import signals as grades_signals
from openedx.core.djangoapps.xblock.apps import get_xblock_app_config
from openedx.core.djangoapps.xblock.runtime.blockstore_field_data import BlockstoreFieldData