diff --git a/lms/djangoapps/bulk_email/tests/test_email.py b/lms/djangoapps/bulk_email/tests/test_email.py index 9fe1a67ab9..4b4e07d204 100644 --- a/lms/djangoapps/bulk_email/tests/test_email.py +++ b/lms/djangoapps/bulk_email/tests/test_email.py @@ -22,7 +22,7 @@ from markupsafe import escape from mock import Mock, patch from ..models import BulkEmailFlag, Optout -from ..tasks import _get_course_email_context, _get_source_address +from lms.djangoapps.bulk_email.tasks import _get_course_email_context, _get_source_address from course_modes.models import CourseMode from lms.djangoapps.courseware.tests.factories import InstructorFactory, StaffFactory diff --git a/lms/djangoapps/bulk_email/tests/test_err_handling.py b/lms/djangoapps/bulk_email/tests/test_err_handling.py index df970373aa..6cb7eac481 100644 --- a/lms/djangoapps/bulk_email/tests/test_err_handling.py +++ b/lms/djangoapps/bulk_email/tests/test_err_handling.py @@ -19,8 +19,8 @@ from opaque_keys.edx.locator import CourseLocator from six import text_type from six.moves import range -from bulk_email.models import SEND_TO_MYSELF, BulkEmailFlag, CourseEmail -from bulk_email.tasks import perform_delegate_email_batches, send_course_email +from lms.djangoapps.bulk_email.models import SEND_TO_MYSELF, BulkEmailFlag, CourseEmail +from lms.djangoapps.bulk_email.tasks import perform_delegate_email_batches, send_course_email from lms.djangoapps.instructor_task.exceptions import DuplicateTaskException from lms.djangoapps.instructor_task.models import InstructorTask from lms.djangoapps.instructor_task.subtasks import ( diff --git a/lms/djangoapps/bulk_email/tests/test_tasks.py b/lms/djangoapps/bulk_email/tests/test_tasks.py index 4ab4de01e6..ae3ab0fcc7 100644 --- a/lms/djangoapps/bulk_email/tests/test_tasks.py +++ b/lms/djangoapps/bulk_email/tests/test_tasks.py @@ -33,7 +33,7 @@ from opaque_keys.edx.locator import CourseLocator from six.moves import range from ..models import SEND_TO_LEARNERS, SEND_TO_MYSELF, SEND_TO_STAFF, CourseEmail, Optout -from ..tasks import _get_course_email_context +from lms.djangoapps.bulk_email.tasks import _get_course_email_context from lms.djangoapps.instructor_task.models import InstructorTask from lms.djangoapps.instructor_task.subtasks import SubtaskStatus, update_subtask_status from lms.djangoapps.instructor_task.tasks import send_bulk_course_email diff --git a/lms/djangoapps/email_marketing/signals.py b/lms/djangoapps/email_marketing/signals.py index 88f14b5f48..402bc2f6d5 100644 --- a/lms/djangoapps/email_marketing/signals.py +++ b/lms/djangoapps/email_marketing/signals.py @@ -25,7 +25,7 @@ from openedx.core.djangoapps.waffle_utils import WaffleSwitchNamespace from student.signals import SAILTHRU_AUDIT_PURCHASE from util.model_utils import USER_FIELD_CHANGED -from .tasks import update_course_enrollment +from lms.djangoapps.email_marketing.tasks import update_course_enrollment log = logging.getLogger(__name__) diff --git a/lms/djangoapps/email_marketing/tests/test_signals.py b/lms/djangoapps/email_marketing/tests/test_signals.py index fd8ab711c9..43d158e9aa 100644 --- a/lms/djangoapps/email_marketing/tests/test_signals.py +++ b/lms/djangoapps/email_marketing/tests/test_signals.py @@ -27,7 +27,7 @@ from ..signals import ( email_marketing_user_field_changed, update_sailthru ) -from ..tasks import ( +from lms.djangoapps.email_marketing.tasks import ( _create_user_list, _get_list_from_email_marketing_provider, _get_or_create_user_list, diff --git a/lms/djangoapps/gating/signals.py b/lms/djangoapps/gating/signals.py index 36085996f6..a99e5c5180 100644 --- a/lms/djangoapps/gating/signals.py +++ b/lms/djangoapps/gating/signals.py @@ -8,8 +8,8 @@ from completion.models import BlockCompletion from django.db import models from django.dispatch import receiver -from gating import api as gating_api -from gating.tasks import task_evaluate_subsection_completion_milestones +from lms.djangoapps.gating import api as gating_api +from lms.djangoapps.gating.tasks import task_evaluate_subsection_completion_milestones from lms.djangoapps.grades.api import signals as grades_signals from openedx.core.djangoapps.signals.signals import COURSE_GRADE_CHANGED diff --git a/lms/djangoapps/grades/management/commands/compute_grades.py b/lms/djangoapps/grades/management/commands/compute_grades.py index 683506c5b8..ed047dd5ac 100644 --- a/lms/djangoapps/grades/management/commands/compute_grades.py +++ b/lms/djangoapps/grades/management/commands/compute_grades.py @@ -12,7 +12,7 @@ from lms.djangoapps.grades.config.models import ComputeGradesSetting from openedx.core.lib.command_utils import get_mutually_exclusive_required_option, parse_course_keys from xmodule.modulestore.django import modulestore -from ... import tasks +from lms.djangoapps.grades import tasks log = logging.getLogger(__name__) diff --git a/lms/djangoapps/grades/signals/handlers.py b/lms/djangoapps/grades/signals/handlers.py index 6091fe27e1..887f0f5022 100644 --- a/lms/djangoapps/grades/signals/handlers.py +++ b/lms/djangoapps/grades/signals/handlers.py @@ -24,7 +24,7 @@ from .. import events from ..constants import ScoreDatabaseTableEnum from ..course_grade_factory import CourseGradeFactory from ..scores import weighted_score -from ..tasks import ( +from lms.djangoapps.grades.tasks import ( RECALCULATE_GRADE_DELAY_SECONDS, recalculate_course_and_subsection_grades_for_user, recalculate_subsection_grade_v3 diff --git a/lms/djangoapps/instructor_task/tasks.py b/lms/djangoapps/instructor_task/tasks.py index bd7f428a64..22109058d9 100644 --- a/lms/djangoapps/instructor_task/tasks.py +++ b/lms/djangoapps/instructor_task/tasks.py @@ -28,7 +28,7 @@ from celery import task from django.conf import settings from django.utils.translation import ugettext_noop -from bulk_email.tasks import perform_delegate_email_batches +from lms.djangoapps.bulk_email.tasks import perform_delegate_email_batches from lms.djangoapps.instructor_task.tasks_base import BaseInstructorTask from lms.djangoapps.instructor_task.tasks_helper.certs import generate_students_certificates from lms.djangoapps.instructor_task.tasks_helper.enrollments import ( diff --git a/lms/djangoapps/lti_provider/management/commands/resend_lti_scores.py b/lms/djangoapps/lti_provider/management/commands/resend_lti_scores.py index 728f8a6235..95b8a19165 100644 --- a/lms/djangoapps/lti_provider/management/commands/resend_lti_scores.py +++ b/lms/djangoapps/lti_provider/management/commands/resend_lti_scores.py @@ -9,8 +9,8 @@ import six from django.core.management import BaseCommand from opaque_keys.edx.keys import CourseKey -from lti_provider import tasks -from lti_provider.models import GradedAssignment +from lms.djangoapps.lti_provider import tasks +from lms.djangoapps.lti_provider.models import GradedAssignment class Command(BaseCommand): diff --git a/lms/djangoapps/lti_provider/signals.py b/lms/djangoapps/lti_provider/signals.py index bbba8e456f..896932c689 100644 --- a/lms/djangoapps/lti_provider/signals.py +++ b/lms/djangoapps/lti_provider/signals.py @@ -8,11 +8,11 @@ from django.conf import settings from django.dispatch import receiver from opaque_keys.edx.keys import LearningContextKey -import lti_provider.outcomes as outcomes +import lms.djangoapps.lti_provider.outcomes as outcomes from lms.djangoapps.grades.api import signals as grades_signals -from lti_provider.views import parse_course_and_usage_keys +from lms.djangoapps.lti_provider.views import parse_course_and_usage_keys from xmodule.modulestore.django import modulestore -from .tasks import send_composite_outcome, send_leaf_outcome +from lms.djangoapps.lti_provider.tasks import send_composite_outcome, send_leaf_outcome log = logging.getLogger(__name__) diff --git a/lms/djangoapps/program_enrollments/apps.py b/lms/djangoapps/program_enrollments/apps.py index 3b9fcaa2b8..3d5b03cfce 100644 --- a/lms/djangoapps/program_enrollments/apps.py +++ b/lms/djangoapps/program_enrollments/apps.py @@ -30,5 +30,5 @@ class ProgramEnrollmentsConfig(AppConfig): """ Connect handlers to signals. """ - from . import signals # pylint: disable=unused-import - from . import tasks # pylint: disable=unused-import + from lms.djangoapps.program_enrollments import signals # pylint: disable=unused-import + from lms.djangoapps.program_enrollments import tasks # pylint: disable=unused-import diff --git a/lms/djangoapps/program_enrollments/management/commands/expire_waiting_enrollments.py b/lms/djangoapps/program_enrollments/management/commands/expire_waiting_enrollments.py index 0d550dd010..daf4edcfc6 100644 --- a/lms/djangoapps/program_enrollments/management/commands/expire_waiting_enrollments.py +++ b/lms/djangoapps/program_enrollments/management/commands/expire_waiting_enrollments.py @@ -5,7 +5,7 @@ import logging from django.core.management.base import BaseCommand -from ... import tasks +from lms.djangoapps.program_enrollments import tasks logger = logging.getLogger(__name__) diff --git a/lms/djangoapps/verify_student/apps.py b/lms/djangoapps/verify_student/apps.py index ec786b82c3..f01bdef7e9 100644 --- a/lms/djangoapps/verify_student/apps.py +++ b/lms/djangoapps/verify_student/apps.py @@ -17,5 +17,5 @@ class VerifyStudentConfig(AppConfig): """ Connect signal handlers. """ - from . import signals # pylint: disable=unused-import - from . import tasks # pylint: disable=unused-import + from lms.djangoapps.verify_student import signals # pylint: disable=unused-import + from lms.djangoapps.verify_student import tasks # pylint: disable=unused-import diff --git a/openedx/core/djangoapps/coursegraph/apps.py b/openedx/core/djangoapps/coursegraph/apps.py index 36aed0f98a..ecedf33d19 100644 --- a/openedx/core/djangoapps/coursegraph/apps.py +++ b/openedx/core/djangoapps/coursegraph/apps.py @@ -14,4 +14,4 @@ class CoursegraphConfig(AppConfig): """ name = 'openedx.core.djangoapps.coursegraph' - from . import tasks + from openedx.core.djangoapps.coursegraph import tasks diff --git a/openedx/core/djangoapps/credentials/apps.py b/openedx/core/djangoapps/credentials/apps.py index 8ac0fad6ba..f55cdd2db1 100644 --- a/openedx/core/djangoapps/credentials/apps.py +++ b/openedx/core/djangoapps/credentials/apps.py @@ -44,4 +44,4 @@ class CredentialsConfig(AppConfig): def ready(self): # Register celery workers - from .tasks.v1 import tasks # pylint: disable=unused-variable + from openedx.core.djangoapps.credentials.tasks.v1 import tasks # pylint: disable=unused-variable diff --git a/openedx/core/djangoapps/credentials/tests/test_tasks.py b/openedx/core/djangoapps/credentials/tests/test_tasks.py index 4ca4334259..ef927306ef 100644 --- a/openedx/core/djangoapps/credentials/tests/test_tasks.py +++ b/openedx/core/djangoapps/credentials/tests/test_tasks.py @@ -10,7 +10,7 @@ from django.test import TestCase, override_settings from openedx.core.djangolib.testing.utils import skip_unless_lms from student.tests.factories import UserFactory -from ..tasks.v1 import tasks +from openedx.core.djangoapps.credentials.tasks.v1 import tasks TASKS_MODULE = 'openedx.core.djangoapps.credentials.tasks.v1.tasks' diff --git a/openedx/features/enterprise_support/signals.py b/openedx/features/enterprise_support/signals.py index 7e2041d17a..c53f574242 100644 --- a/openedx/features/enterprise_support/signals.py +++ b/openedx/features/enterprise_support/signals.py @@ -13,7 +13,7 @@ from django.dispatch import receiver from enterprise.models import EnterpriseCourseEnrollment, EnterpriseCustomer, EnterpriseCustomerUser from integrated_channels.integrated_channel.tasks import transmit_single_learner_data -from email_marketing.tasks import update_user +from lms.djangoapps.email_marketing.tasks import update_user from openedx.core.djangoapps.commerce.utils import ecommerce_api_client from openedx.core.djangoapps.signals.signals import COURSE_GRADE_NOW_PASSED from openedx.features.enterprise_support.api import enterprise_enabled