From 760743cca280bb0828a4cbaeb2d84bccf3d0c51d Mon Sep 17 00:00:00 2001
From: Stu Young <estute@users.noreply.github.com>
Date: Tue, 21 May 2019 11:45:40 -0400
Subject: [PATCH] INCR-294 Run python-modernize on lms/djangoapps/bulk_enroll
 (#20601)

* run python modernize

* run isort

* Fix python
---
 lms/djangoapps/bulk_enroll/serializers.py     |  6 +++++-
 .../bulk_enroll/tests/test_views.py           | 19 +++++++++----------
 lms/djangoapps/bulk_enroll/urls.py            |  2 ++
 lms/djangoapps/bulk_enroll/views.py           | 11 +++++------
 4 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/lms/djangoapps/bulk_enroll/serializers.py b/lms/djangoapps/bulk_enroll/serializers.py
index 50d0701bf5..f025c2d6d3 100644
--- a/lms/djangoapps/bulk_enroll/serializers.py
+++ b/lms/djangoapps/bulk_enroll/serializers.py
@@ -1,10 +1,14 @@
 """
 Serializers for Bulk Enrollment.
 """
+from __future__ import absolute_import
+
 from opaque_keys import InvalidKeyError
 from opaque_keys.edx.keys import CourseKey
-from openedx.core.djangoapps.course_groups.cohorts import is_cohort_exists
 from rest_framework import serializers
+from six.moves import zip
+
+from openedx.core.djangoapps.course_groups.cohorts import is_cohort_exists
 
 
 class StringListField(serializers.ListField):
diff --git a/lms/djangoapps/bulk_enroll/tests/test_views.py b/lms/djangoapps/bulk_enroll/tests/test_views.py
index b1f9fd046f..445eaca7a0 100644
--- a/lms/djangoapps/bulk_enroll/tests/test_views.py
+++ b/lms/djangoapps/bulk_enroll/tests/test_views.py
@@ -1,28 +1,27 @@
 """
 Tests for the Bulk Enrollment views.
 """
-import ddt
+from __future__ import absolute_import
+
 import json
+
+import ddt
+import six
 from django.conf import settings
 from django.contrib.auth.models import User
 from django.core import mail
-from django.urls import reverse
 from django.test.utils import override_settings
+from django.urls import reverse
+from opaque_keys.edx.keys import CourseKey
 from rest_framework.test import APIRequestFactory, APITestCase, force_authenticate
 
 from bulk_enroll.serializers import BulkEnrollmentSerializer
 from bulk_enroll.views import BulkEnrollView
 from courseware.tests.helpers import LoginEnrollmentTestCase
-from opaque_keys.edx.keys import CourseKey
 from openedx.core.djangoapps.course_groups.cohorts import get_cohort_id
 from openedx.core.djangoapps.course_groups.tests.helpers import config_course_cohorts
 from openedx.core.djangoapps.site_configuration.helpers import get_value as get_site_value
-from student.models import (
-    CourseEnrollment,
-    ManualEnrollmentAudit,
-    ENROLLED_TO_UNENROLLED,
-    UNENROLLED_TO_ENROLLED,
-)
+from student.models import ENROLLED_TO_UNENROLLED, UNENROLLED_TO_ENROLLED, CourseEnrollment, ManualEnrollmentAudit
 from student.tests.factories import UserFactory
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
 from xmodule.modulestore.tests.factories import CourseFactory
@@ -55,7 +54,7 @@ class BulkEnrollmentTest(ModuleStoreTestCase, LoginEnrollmentTestCase, APITestCa
         )
 
         self.course = CourseFactory.create()
-        self.course_key = unicode(self.course.id)
+        self.course_key = six.text_type(self.course.id)
         self.enrolled_student = UserFactory(username='EnrolledStudent', first_name='Enrolled', last_name='Student')
         CourseEnrollment.enroll(
             self.enrolled_student,
diff --git a/lms/djangoapps/bulk_enroll/urls.py b/lms/djangoapps/bulk_enroll/urls.py
index 444a304f45..89ee6f1b00 100644
--- a/lms/djangoapps/bulk_enroll/urls.py
+++ b/lms/djangoapps/bulk_enroll/urls.py
@@ -1,6 +1,8 @@
 """
 URLs for the Bulk Enrollment API
 """
+from __future__ import absolute_import
+
 from django.conf.urls import url
 
 from bulk_enroll.views import BulkEnrollView
diff --git a/lms/djangoapps/bulk_enroll/views.py b/lms/djangoapps/bulk_enroll/views.py
index 998bb75282..22cf97d309 100644
--- a/lms/djangoapps/bulk_enroll/views.py
+++ b/lms/djangoapps/bulk_enroll/views.py
@@ -1,10 +1,14 @@
 """
 API views for Bulk Enrollment
 """
+from __future__ import absolute_import
+
 import itertools
 import json
 
 from edx_rest_framework_extensions.auth.jwt.authentication import JwtAuthentication
+from opaque_keys import InvalidKeyError
+from opaque_keys.edx.keys import CourseKey
 from rest_framework import status
 from rest_framework.response import Response
 from rest_framework.views import APIView
@@ -12,12 +16,7 @@ from rest_framework.views import APIView
 from bulk_enroll.serializers import BulkEnrollmentSerializer
 from enrollment.views import EnrollmentUserThrottle
 from instructor.views.api import students_update_enrollment
-from opaque_keys import InvalidKeyError
-from opaque_keys.edx.keys import CourseKey
-from openedx.core.djangoapps.course_groups.cohorts import (
-    get_cohort_by_name,
-    add_user_to_cohort,
-)
+from openedx.core.djangoapps.course_groups.cohorts import add_user_to_cohort, get_cohort_by_name
 from openedx.core.djangoapps.course_groups.models import CourseUserGroup
 from openedx.core.lib.api.authentication import OAuth2Authentication
 from openedx.core.lib.api.permissions import IsStaff