Merge pull request #20918 from amitvadhel/INCR-465

INCR-465: Updates on Python 3.x and disable: import-error

lms/djangoapps/ccx/api/v0/tests/test_views.py

@@ -1,16 +1,19 @@
 """
 Tests for the CCX REST APIs.
 """
+from __future__ import absolute_import
+
 import json
 import math
 import string
-import urllib
-import urlparse
 from datetime import timedelta
-from itertools import izip
 
 import ddt
 import mock
+import six
+import six.moves.urllib.error  # pylint: disable=import-error
+import six.moves.urllib.parse  # pylint: disable=import-error
+import six.moves.urllib.request  # pylint: disable=import-error
 from ccx_keys.locator import CCXLocator
 from django.conf import settings
 from django.contrib.auth.models import User
@@ -22,6 +25,7 @@ from provider.constants import CONFIDENTIAL
 from provider.oauth2.models import Client, Grant
 from rest_framework import status
 from rest_framework.test import APITestCase
+from six.moves import range, zip
 
 from courseware import courses
 from lms.djangoapps.ccx.api.v0 import views
@@ -54,7 +58,7 @@ class CcxRestApiTest(CcxTestCase, APITestCase):
         super(CcxRestApiTest, self).setUp()
         # add some info about the course for easy access
         self.master_course_key = self.course.location.course_key
-        self.master_course_key_str = unicode(self.master_course_key)
+        self.master_course_key_str = six.text_type(self.master_course_key)
         # OAUTH2 setup
         # create a specific user for the application
         self.app_user = app_user = UserFactory(
@@ -155,7 +159,7 @@ class CcxRestApiTest(CcxTestCase, APITestCase):
         self.assertIn('field_errors', resp_obj.data)
         # restructure the error dictionary for a easier comparison
         resp_dict_error = {}
-        for field_name, error_dict in resp_obj.data['field_errors'].iteritems():
+        for field_name, error_dict in six.iteritems(resp_obj.data['field_errors']):
             resp_dict_error[field_name] = error_dict.get('error_code', '')
         self.assertEqual(expected_field_errors, resp_dict_error)
 
@@ -177,9 +181,9 @@ class CcxListTest(CcxRestApiTest):
         """
         super(CcxListTest, self).setUp()
         self.list_url = reverse('ccx_api:v0:ccx:list')
-        self.list_url_master_course = urlparse.urljoin(
+        self.list_url_master_course = six.moves.urllib.parse.urljoin(
             self.list_url,
-            '?master_course_id={0}'.format(urllib.quote_plus(self.master_course_key_str))
+            '?master_course_id={0}'.format(six.moves.urllib.parse.quote_plus(self.master_course_key_str))
         )
 
     @ddt.data(*AUTH_ATTRS)
@@ -290,7 +294,7 @@ class CcxListTest(CcxRestApiTest):
             resp = self.client.get(self.list_url, {}, HTTP_AUTHORIZATION=getattr(self, auth_attr))
             self.expect_error(status.HTTP_400_BAD_REQUEST, 'master_course_id_not_provided', resp)
 
-            base_url = urlparse.urljoin(self.list_url, '?master_course_id=')
+            base_url = six.moves.urllib.parse.urljoin(self.list_url, '?master_course_id=')
             # case with empty master_course_id
             resp = self.client.get(base_url, {}, HTTP_AUTHORIZATION=getattr(self, auth_attr))
             self.expect_error(status.HTTP_400_BAD_REQUEST, 'course_id_not_valid', resp)
@@ -317,7 +321,7 @@ class CcxListTest(CcxRestApiTest):
 
         # create few ccx courses
         num_ccx = 10
-        for _ in xrange(num_ccx):
+        for _ in range(num_ccx):
             self.make_ccx()
         resp = self.client.get(self.list_url_master_course, {}, HTTP_AUTHORIZATION=getattr(self, auth_attr))
         self.assertEqual(resp.status_code, status.HTTP_200_OK)
@@ -333,7 +337,7 @@ class CcxListTest(CcxRestApiTest):
         """
         # create few ccx courses
         num_ccx = 3
-        for _ in xrange(num_ccx):
+        for _ in range(num_ccx):
             self.make_ccx()
         # update the display_name fields
         all_ccx = CustomCourseForEdX.objects.all()
@@ -368,7 +372,7 @@ class CcxListTest(CcxRestApiTest):
         """
         # create some ccx courses
         num_ccx = 357
-        for _ in xrange(num_ccx):
+        for _ in range(num_ccx):
             self.make_ccx()
         page_size = settings.REST_FRAMEWORK.get('PAGE_SIZE', 10)
         num_pages = int(math.ceil(num_ccx / float(page_size)))
@@ -763,14 +767,14 @@ class CcxListTest(CcxRestApiTest):
         resp = self.client.post(self.list_url, data, format='json', HTTP_AUTHORIZATION=getattr(self, auth_attr))
         self.assertEqual(resp.status_code, status.HTTP_201_CREATED)
         # check if the response has at least the same data of the request
-        for key, val in data.iteritems():
+        for key, val in six.iteritems(data):
             self.assertEqual(resp.data.get(key), val)
         self.assertIn('ccx_course_id', resp.data)
         # check that the new CCX actually exists
         course_key = CourseKey.from_string(resp.data.get('ccx_course_id'))
         ccx_course = CustomCourseForEdX.objects.get(pk=course_key.ccx)
         self.assertEqual(
-            unicode(CCXLocator.from_course_locator(ccx_course.course.id, ccx_course.id)),
+            six.text_type(CCXLocator.from_course_locator(ccx_course.course.id, ccx_course.id)),
             resp.data.get('ccx_course_id')
         )
         # check that the coach user has coach role on the master course
@@ -866,7 +870,7 @@ class CcxListTest(CcxRestApiTest):
         # Make sure the "Coach" on the parent course is "Staff" on the CCX
         self.assertIn(self.coach, list_staff_ccx_course)
         self.assertEqual(len(list_instructor_master_course), len(list_instructor_ccx_course))
-        for course_user, ccx_user in izip(sorted(list_instructor_master_course), sorted(list_instructor_ccx_course)):
+        for course_user, ccx_user in zip(sorted(list_instructor_master_course), sorted(list_instructor_ccx_course)):
             self.assertEqual(course_user, ccx_user)
 
 
@@ -886,7 +890,7 @@ class CcxDetailTest(CcxRestApiTest):
         # create a ccx
         self.ccx = self.make_ccx(max_students_allowed=123)
         self.ccx_key = CCXLocator.from_course_locator(self.ccx.course.id, self.ccx.id)
-        self.ccx_key_str = unicode(self.ccx_key)
+        self.ccx_key_str = six.text_type(self.ccx_key)
         self.detail_url = reverse('ccx_api:v0:ccx:detail', kwargs={'ccx_course_id': self.ccx_key_str})
 
     def make_ccx(self, max_students_allowed=200):
@@ -1100,7 +1104,7 @@ class CcxDetailTest(CcxRestApiTest):
             self.ccx.max_student_enrollments_allowed
         )
         self.assertEqual(resp.data.get('coach_email'), self.ccx.coach.email)  # pylint: disable=no-member
-        self.assertEqual(resp.data.get('master_course_id'), unicode(self.ccx.course_id))
+        self.assertEqual(resp.data.get('master_course_id'), six.text_type(self.ccx.course_id))
         self.assertItemsEqual(resp.data.get('course_modules'), self.master_course_chapters)
 
     @ddt.data(*AUTH_ATTRS)

lms/djangoapps/ccx/api/v0/urls.py

@@ -1,6 +1,8 @@
 """
 CCX API v0 URLs.
 """
+from __future__ import absolute_import
+
 from django.conf import settings
 from django.conf.urls import include, url
 

lms/djangoapps/support/decorators.py

@@ -1,6 +1,8 @@
 """
 Decorators used by the support app.
 """
+from __future__ import absolute_import
+
 from functools import wraps
 
 from django.contrib.auth.decorators import login_required

lms/djangoapps/support/serializers.py

@@ -1,6 +1,8 @@
 """
 Serializers for use in the support app.
 """
+from __future__ import absolute_import
+
 from rest_framework import serializers
 
 from student.models import ManualEnrollmentAudit

lms/djangoapps/support/urls.py

@@ -1,6 +1,8 @@
 """
 URLs for the student support app.
 """
+from __future__ import absolute_import
+
 from django.conf.urls import url
 
 from lms.djangoapps.support.views.contact_us import ContactUsView