Skip to content

Commit

Permalink
fix the imports for canvas_integration and remote_gradebook apps (#259)
Browse files Browse the repository at this point in the history
  • Loading branch information
Umar Asghar authored and blarghmatey committed Sep 7, 2021
1 parent bbe7d06 commit 9965654
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 23 deletions.
4 changes: 2 additions & 2 deletions lms/djangoapps/canvas_integration/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

from opaque_keys.edx.locator import CourseLocator

from courseware.courses import get_course_by_id
from lms.djangoapps.courseware.courses import get_course_by_id
from lms.djangoapps.grades.course_grade_factory import CourseGradeFactory
from lms.djangoapps.remote_gradebook.api import enroll_emails_in_course, get_enrolled_non_staff_users, course_graded_items
from student.models import CourseEnrollment
from common.djangoapps.student.models import CourseEnrollment
from lms.djangoapps.canvas_integration.client import CanvasClient, create_assignment_payload, update_grade_payload_kv

log = logging.getLogger(__name__)
Expand Down
4 changes: 2 additions & 2 deletions lms/djangoapps/canvas_integration/task_helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
from time import time

from lms.djangoapps.canvas_integration import api
from courseware.courses import get_course_by_id
from instructor_task.tasks_helper.runner import TaskProgress
from lms.djangoapps.courseware.courses import get_course_by_id
from lms.djangoapps.instructor_task.tasks_helper.runner import TaskProgress


def sync_canvas_enrollments(_xmodule_instance_args, _entry_id, course_id, task_input, action_name):
Expand Down
8 changes: 4 additions & 4 deletions lms/djangoapps/canvas_integration/tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
TASK_TYPE_SYNC_CANVAS_ENROLLMENTS,
TASK_TYPE_PUSH_EDX_GRADES_TO_CANVAS,
)
from courseware.courses import get_course_by_id
from instructor_task.api_helper import submit_task
from instructor_task.tasks_base import BaseInstructorTask
from instructor_task.tasks_helper.runner import run_main_task
from lms.djangoapps.courseware.courses import get_course_by_id
from lms.djangoapps.instructor_task.api_helper import submit_task
from lms.djangoapps.instructor_task.tasks_base import BaseInstructorTask
from lms.djangoapps.instructor_task.tasks_helper.runner import run_main_task


TASK_LOG = logging.getLogger('edx.celery.task')
Expand Down
6 changes: 3 additions & 3 deletions lms/djangoapps/canvas_integration/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
from opaque_keys.edx.locator import CourseLocator

from lms.djangoapps.canvas_integration.client import CanvasClient
from courseware.courses import get_course_by_id
from lms.djangoapps.courseware.courses import get_course_by_id
from lms.djangoapps.canvas_integration import tasks
from lms.djangoapps.instructor_task.api_helper import AlreadyRunningError
from lms.djangoapps.instructor.views.api import require_course_permission
from lms.djangoapps.instructor import permissions
from student.models import CourseEnrollment, CourseEnrollmentAllowed
from util.json_request import JsonResponse
from common.djangoapps.student.models import CourseEnrollment, CourseEnrollmentAllowed
from common.djangoapps.util.json_request import JsonResponse


log = logging.getLogger(__name__)
Expand Down
6 changes: 3 additions & 3 deletions lms/djangoapps/remote_gradebook/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
API functionality for the remote gradebook app
"""
from django.contrib.auth.models import User
from courseware.access import has_access
from grades.context import grading_context_for_course
from student.models import CourseEnrollmentAllowed, CourseEnrollment
from lms.djangoapps.courseware.access import has_access
from lms.djangoapps.grades.context import grading_context_for_course
from common.djangoapps.student.models import CourseEnrollmentAllowed, CourseEnrollment


def enroll_emails_in_course(emails, course_key):
Expand Down
6 changes: 3 additions & 3 deletions lms/djangoapps/remote_gradebook/tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
from django.conf import settings
from django.utils.translation import ugettext_noop

from instructor_task.api_helper import submit_task
from instructor_task.tasks_base import BaseInstructorTask
from instructor_task.tasks_helper.runner import run_main_task
from lms.djangoapps.instructor_task.api_helper import submit_task
from lms.djangoapps.instructor_task.tasks_base import BaseInstructorTask
from lms.djangoapps.instructor_task.tasks_helper.runner import run_main_task
from lms.djangoapps.remote_gradebook.task_helpers import generate_assignment_grade_csv, post_grades_to_rgb
from lms.djangoapps.remote_gradebook.constants import (
TASK_TYPE_RGB_EXPORT_ASSIGNMENT_GRADES,
Expand Down
2 changes: 1 addition & 1 deletion lms/djangoapps/remote_gradebook/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
from openedx.core.djangolib.markup import HTML

from lms.djangoapps.grades.course_grade_factory import CourseGradeFactory
from student.models import CourseEnrollment
from common.djangoapps.student.models import CourseEnrollment

log = logging.getLogger(__name__)

Expand Down
10 changes: 5 additions & 5 deletions lms/djangoapps/remote_gradebook/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

from lms.djangoapps.instructor.views.api import require_course_permission
from lms.djangoapps.instructor import permissions
from lms.djangoapps import remote_gradebook.tasks
import lms.djangoapps.remote_gradebook.tasks
from lms.djangoapps.remote_gradebook.api import (
enroll_emails_in_course,
get_enrolled_non_staff_users,
Expand All @@ -27,10 +27,10 @@
get_assignment_grade_datatable,
get_remote_gradebook_datatable_resp,
)
from courseware.courses import get_course_by_id
from util.json_request import JsonResponse
from student.models import CourseEnrollment
from instructor_task.api_helper import AlreadyRunningError
from lms.djangoapps.courseware.courses import get_course_by_id
from common.djangoapps.util.json_request import JsonResponse
from common.djangoapps.student.models import CourseEnrollment
from lms.djangoapps.instructor_task.api_helper import AlreadyRunningError

log = logging.getLogger(__name__)

Expand Down

0 comments on commit 9965654

Please sign in to comment.