INCR-284 Run python-modernize on lms/djangoapps/program_enrollments/api (#20591)

* run python modernize

* run isort
This commit is contained in:
Stu Young
2019-05-21 11:29:23 -04:00
committed by Christie Rice
parent 4e1f63bd15
commit fa3f71cd13
6 changed files with 17 additions and 13 deletions

View File

@@ -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'

View File

@@ -1,6 +1,8 @@
"""
API Serializers
"""
from __future__ import absolute_import
from rest_framework import serializers
from six import text_type

View File

@@ -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

View File

@@ -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,

View File

@@ -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 = [

View File

@@ -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