From 090b8ed0111ffb68840bd7199db7c841647abc8e Mon Sep 17 00:00:00 2001
From: Stu Young <estute@users.noreply.github.com>
Date: Thu, 16 May 2019 12:42:56 -0400
Subject: [PATCH] incr-285 (#20592)

* run python modernize

* run isort

* quality
---
 lms/djangoapps/course_api/tests/mixins.py          |  2 ++
 lms/djangoapps/course_api/tests/test_api.py        |  2 ++
 lms/djangoapps/course_api/tests/test_forms.py      |  7 +++++--
 .../course_api/tests/test_permissions.py           |  2 ++
 .../course_api/tests/test_serializers.py           |  2 +-
 lms/djangoapps/course_api/tests/test_views.py      | 14 +++++++++-----
 6 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/lms/djangoapps/course_api/tests/mixins.py b/lms/djangoapps/course_api/tests/mixins.py
index 11e6ae5943..c4523336d0 100644
--- a/lms/djangoapps/course_api/tests/mixins.py
+++ b/lms/djangoapps/course_api/tests/mixins.py
@@ -2,6 +2,8 @@
 Common mixins for Course API Tests
 """
 
+from __future__ import absolute_import
+
 from datetime import datetime
 
 from student.tests.factories import UserFactory
diff --git a/lms/djangoapps/course_api/tests/test_api.py b/lms/djangoapps/course_api/tests/test_api.py
index 5e7d2f10a9..907ff569cb 100644
--- a/lms/djangoapps/course_api/tests/test_api.py
+++ b/lms/djangoapps/course_api/tests/test_api.py
@@ -1,6 +1,8 @@
 """
 Test for course API
 """
+from __future__ import absolute_import
+
 from hashlib import md5
 
 from django.contrib.auth.models import AnonymousUser
diff --git a/lms/djangoapps/course_api/tests/test_forms.py b/lms/djangoapps/course_api/tests/test_forms.py
index ae8fff4e23..6fadb0cebf 100644
--- a/lms/djangoapps/course_api/tests/test_forms.py
+++ b/lms/djangoapps/course_api/tests/test_forms.py
@@ -2,10 +2,13 @@
 Tests for Course API forms.
 """
 
+from __future__ import absolute_import
+
 from itertools import product
-from urllib import urlencode
 
 import ddt
+import six
+from six.moves.urllib.parse import urlencode  # pylint: disable=import-error
 from django.contrib.auth.models import AnonymousUser
 from django.http import QueryDict
 
@@ -125,7 +128,7 @@ class TestCourseDetailGetForm(FormTestMixin, UsernameTestMixin, SharedModuleStor
         self.form_data = QueryDict(
             urlencode({
                 'username': user.username,
-                'course_key': unicode(self.course.id),
+                'course_key': six.text_type(self.course.id),
             }),
             mutable=True,
         )
diff --git a/lms/djangoapps/course_api/tests/test_permissions.py b/lms/djangoapps/course_api/tests/test_permissions.py
index 62efdbdfa7..a61ea009a5 100644
--- a/lms/djangoapps/course_api/tests/test_permissions.py
+++ b/lms/djangoapps/course_api/tests/test_permissions.py
@@ -2,6 +2,8 @@
 Test authorization functions
 """
 
+from __future__ import absolute_import
+
 from django.contrib.auth.models import AnonymousUser
 from django.test import TestCase
 
diff --git a/lms/djangoapps/course_api/tests/test_serializers.py b/lms/djangoapps/course_api/tests/test_serializers.py
index 45197a6422..42c44c7448 100644
--- a/lms/djangoapps/course_api/tests/test_serializers.py
+++ b/lms/djangoapps/course_api/tests/test_serializers.py
@@ -2,7 +2,7 @@
 Test data created by CourseSerializer and CourseDetailSerializer
 """
 
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
 
 from datetime import datetime
 
diff --git a/lms/djangoapps/course_api/tests/test_views.py b/lms/djangoapps/course_api/tests/test_views.py
index 0f84860206..57d7059b03 100644
--- a/lms/djangoapps/course_api/tests/test_views.py
+++ b/lms/djangoapps/course_api/tests/test_views.py
@@ -1,26 +1,30 @@
 """
 Tests for Course API views.
 """
+from __future__ import absolute_import
+
 from datetime import datetime
-import ddt
 from hashlib import md5
 
+import ddt
+import six
+from six.moves import range
 from django.core.exceptions import ImproperlyConfigured
-from django.urls import reverse
 from django.test import RequestFactory
 from django.test.utils import override_settings
+from django.urls import reverse
+from edx_django_utils.cache import RequestCache
 from search.tests.test_course_discovery import DemoCourse
 from search.tests.tests import TEST_INDEX_NAME
 from search.tests.utils import SearcherMixin
+from waffle.testutils import override_switch
 
 from course_modes.models import CourseMode
 from course_modes.tests.factories import CourseModeFactory
-from edx_django_utils.cache import RequestCache
 from openedx.features.content_type_gating.models import ContentTypeGatingConfig
 from openedx.features.course_duration_limits.models import CourseDurationLimitConfig
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase, SharedModuleStoreTestCase
 from xmodule.modulestore.tests.factories import CourseFactory
-from waffle.testutils import override_switch
 
 from ..views import CourseDetailView, CourseListUserThrottle
 from .mixins import TEST_PASSWORD, CourseApiFactoryMixin
@@ -198,7 +202,7 @@ class CourseListViewTestCaseMultipleCourses(CourseApiTestViewMixin, ModuleStoreT
             response = self.verify_response(params=params)
             self.assertEquals(
                 {course['course_id'] for course in response.data['results']},
-                {unicode(course.id) for course in expected_courses},
+                {six.text_type(course.id) for course in expected_courses},
                 u"testing course_api.views.CourseListView with filter_={}".format(filter_),
             )