From fa3f71cd138f0d9a724f1a6ccd30eb43cdadf112 Mon Sep 17 00:00:00 2001 From: Stu Young Date: Tue, 21 May 2019 11:29:23 -0400 Subject: [PATCH] INCR-284 Run python-modernize on lms/djangoapps/program_enrollments/api (#20591) * run python modernize * run isort --- lms/djangoapps/program_enrollments/api/urls.py | 3 ++- .../program_enrollments/api/v1/serializers.py | 2 ++ .../api/v1/tests/test_serializers.py | 2 +- .../program_enrollments/api/v1/tests/test_views.py | 13 +++++++------ lms/djangoapps/program_enrollments/api/v1/urls.py | 3 ++- lms/djangoapps/program_enrollments/api/v1/views.py | 7 +++---- 6 files changed, 17 insertions(+), 13 deletions(-) diff --git a/lms/djangoapps/program_enrollments/api/urls.py b/lms/djangoapps/program_enrollments/api/urls.py index 85201e4762..973bb62025 100644 --- a/lms/djangoapps/program_enrollments/api/urls.py +++ b/lms/djangoapps/program_enrollments/api/urls.py @@ -2,8 +2,9 @@ Program Enrollment API URLs. """ -from django.conf.urls import include, url +from __future__ import absolute_import +from django.conf.urls import include, url app_name = 'lms.djangoapps.program_enrollments' diff --git a/lms/djangoapps/program_enrollments/api/v1/serializers.py b/lms/djangoapps/program_enrollments/api/v1/serializers.py index 856dba0966..b1c701abc9 100644 --- a/lms/djangoapps/program_enrollments/api/v1/serializers.py +++ b/lms/djangoapps/program_enrollments/api/v1/serializers.py @@ -1,6 +1,8 @@ """ API Serializers """ +from __future__ import absolute_import + from rest_framework import serializers from six import text_type diff --git a/lms/djangoapps/program_enrollments/api/v1/tests/test_serializers.py b/lms/djangoapps/program_enrollments/api/v1/tests/test_serializers.py index 3c11dac304..87b53ecf3e 100644 --- a/lms/djangoapps/program_enrollments/api/v1/tests/test_serializers.py +++ b/lms/djangoapps/program_enrollments/api/v1/tests/test_serializers.py @@ -1,7 +1,7 @@ """ Unit tests for ProgramEnrollment serializers. """ -from __future__ import unicode_literals +from __future__ import absolute_import, unicode_literals from uuid import uuid4 diff --git a/lms/djangoapps/program_enrollments/api/v1/tests/test_views.py b/lms/djangoapps/program_enrollments/api/v1/tests/test_views.py index c9cc3c28f6..33e9026ae5 100644 --- a/lms/djangoapps/program_enrollments/api/v1/tests/test_views.py +++ b/lms/djangoapps/program_enrollments/api/v1/tests/test_views.py @@ -1,7 +1,7 @@ """ Unit tests for ProgramEnrollment views. """ -from __future__ import unicode_literals +from __future__ import absolute_import, unicode_literals import json from uuid import uuid4 @@ -15,6 +15,7 @@ from opaque_keys.edx.keys import CourseKey from rest_framework import status from rest_framework.test import APITestCase from six import text_type +from six.moves import range, zip from lms.djangoapps.courseware.tests.factories import GlobalStaffFactory from lms.djangoapps.program_enrollments.api.v1.constants import MAX_ENROLLMENT_RECORDS, REQUEST_STUDENT_KEY @@ -74,7 +75,7 @@ class ProgramEnrollmentListTest(ListViewTestMixin, APITestCase): """ Helper method for creating program enrollment records. """ - for i in xrange(2): + for i in range(2): user_key = 'user-{}'.format(i) ProgramEnrollmentFactory.create( program_uuid=self.program_uuid, @@ -84,7 +85,7 @@ class ProgramEnrollmentListTest(ListViewTestMixin, APITestCase): external_user_key=user_key, ) - for i in xrange(2, 4): + for i in range(2, 4): user_key = 'user-{}'.format(i) ProgramEnrollmentFactory.create( program_uuid=self.program_uuid, curriculum_uuid=self.curriculum_uuid, external_user_key=user_key, @@ -896,7 +897,7 @@ class ProgramEnrollmentViewPatchTests(APITestCase): def test_successfully_patched_program_enrollment(self): enrollments = {} - for i in xrange(4): + for i in range(4): user_key = 'user-{}'.format(i) instance = ProgramEnrollment.objects.create( program_uuid=self.program_uuid, @@ -1002,7 +1003,7 @@ class ProgramEnrollmentViewPatchTests(APITestCase): def test_duplicate_enrollment(self): enrollments = {} - for i in xrange(4): + for i in range(4): user_key = 'user-{}'.format(i) instance = ProgramEnrollment.objects.create( program_uuid=self.program_uuid, @@ -1043,7 +1044,7 @@ class ProgramEnrollmentViewPatchTests(APITestCase): def test_partially_valid_enrollment(self): enrollments = {} - for i in xrange(4): + for i in range(4): user_key = 'user-{}'.format(i) instance = ProgramEnrollment.objects.create( program_uuid=self.program_uuid, diff --git a/lms/djangoapps/program_enrollments/api/v1/urls.py b/lms/djangoapps/program_enrollments/api/v1/urls.py index 6a5532ed13..1926eda96b 100644 --- a/lms/djangoapps/program_enrollments/api/v1/urls.py +++ b/lms/djangoapps/program_enrollments/api/v1/urls.py @@ -1,11 +1,12 @@ """ Program Enrollments API v1 URLs. """ +from __future__ import absolute_import + from django.conf.urls import url from lms.djangoapps.program_enrollments.api.v1.constants import PROGRAM_UUID_PATTERN from lms.djangoapps.program_enrollments.api.v1.views import ProgramCourseEnrollmentsView, ProgramEnrollmentsView from openedx.core.constants import COURSE_ID_PATTERN - app_name = 'lms.djangoapps.program_enrollments' urlpatterns = [ diff --git a/lms/djangoapps/program_enrollments/api/v1/views.py b/lms/djangoapps/program_enrollments/api/v1/views.py index 4d7dd3c576..319db3fa52 100644 --- a/lms/djangoapps/program_enrollments/api/v1/views.py +++ b/lms/djangoapps/program_enrollments/api/v1/views.py @@ -2,7 +2,7 @@ """ ProgramEnrollment Views """ -from __future__ import unicode_literals +from __future__ import absolute_import, unicode_literals from collections import Counter, OrderedDict from functools import wraps @@ -18,19 +18,18 @@ from rest_framework.pagination import CursorPagination from rest_framework.response import Response from lms.djangoapps.program_enrollments.api.v1.constants import ( - CourseEnrollmentResponseStatuses, MAX_ENROLLMENT_RECORDS, REQUEST_STUDENT_KEY, + CourseEnrollmentResponseStatuses ) from lms.djangoapps.program_enrollments.api.v1.serializers import ( ProgramCourseEnrollmentListSerializer, ProgramCourseEnrollmentRequestSerializer, ProgramEnrollmentListSerializer, - ProgramEnrollmentSerializer, + ProgramEnrollmentSerializer ) from lms.djangoapps.program_enrollments.models import ProgramCourseEnrollment, ProgramEnrollment from lms.djangoapps.program_enrollments.utils import get_user_by_program_id - from openedx.core.djangoapps.catalog.utils import get_programs from openedx.core.djangoapps.content.course_overviews.models import CourseOverview from openedx.core.lib.api.authentication import OAuth2AuthenticationAllowInactiveUser