Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

INCR-456: Make compatible with Python 3.x (#21018)

Browse Source
This commit is contained in:
Amit
2019-07-10 17:14:43 +03:00
committed by Feanil Patel
parent a917f109ec
commit 15dc31ba6d
6 changed files with 40 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lms/djangoapps/lti_provider/users.py
View File

@@ -3,6 +3,8 @@ LTI user management functionality. This module reconciles the two identities
that an individual has in the campus LMS platform and on edX.
"""
from __future__ import absolute_import
import random
import string
import uuid
@@ -12,6 +14,7 @@ from django.contrib.auth import authenticate, login
from django.contrib.auth.models import User
from django.core.exceptions import PermissionDenied
from django.db import IntegrityError, transaction
from six.moves import range
from lti_provider.models import LtiUser
from student.models import UserProfile

5
lms/djangoapps/lti_provider/views.py
View File

@@ -2,8 +2,11 @@
LTI Provider view functions
"""
from __future__ import absolute_import
import logging
import six
from django.conf import settings
from django.http import Http404, HttpResponseBadRequest, HttpResponseForbidden
from django.views.decorators.csrf import csrf_exempt
@@ -144,7 +147,7 @@ def render_courseware(request, usage_key):
"""
# return an HttpResponse object that contains the template and necessary context to render the courseware.
from courseware.views.views import render_xblock
return render_xblock(request, unicode(usage_key), check_if_enrolled=False)
return render_xblock(request, six.text_type(usage_key), check_if_enrolled=False)
def parse_course_and_usage_keys(course_id, usage_id):

7
lms/djangoapps/mobile_api/users/serializers.py
View File

@@ -2,11 +2,14 @@
Serializer for user API
"""
from __future__ import absolute_import
import six
from rest_framework import serializers
from rest_framework.reverse import reverse
from lms.djangoapps.certificates.api import certificate_downloadable_status
from courseware.access import has_access
from lms.djangoapps.certificates.api import certificate_downloadable_status
from openedx.features.course_duration_limits.access import get_user_course_expiration_date
from openedx.features.course_duration_limits.models import CourseDurationLimitConfig
from student.models import CourseEnrollment, User
@@ -18,7 +21,7 @@ class CourseOverviewField(serializers.RelatedField):
Custom field to wrap a CourseOverview object. Read-only.
"""
def to_representation(self, course_overview):
course_id = unicode(course_overview.id)
course_id = six.text_type(course_overview.id)
request = self.context.get('request')
api_version = self.context.get('api_version')

38
lms/djangoapps/mobile_api/users/tests.py
View File

@@ -1,10 +1,13 @@
"""
Tests for users API
"""
from __future__ import absolute_import
import datetime
import ddt
import pytz
import six
from django.conf import settings
from django.template import defaultfilters
from django.test import RequestFactory, override_settings
@@ -12,22 +15,23 @@ from django.utils import timezone
from django.utils.timezone import now
from milestones.tests.utils import MilestonesTestCaseMixin
from mock import patch
from six.moves import range
from course_modes.models import CourseMode
from courseware.access_response import MilestoneAccessError, StartDateError, VisibilityError
from lms.djangoapps.certificates.api import generate_user_certificates
from lms.djangoapps.certificates.models import CertificateStatuses
from lms.djangoapps.certificates.tests.factories import GeneratedCertificateFactory
from lms.djangoapps.grades.tests.utils import mock_passing_grade
from course_modes.models import CourseMode
from courseware.access_response import MilestoneAccessError, StartDateError, VisibilityError
from mobile_api.testutils import (
MobileAPITestCase,
MobileAuthTestMixin,
MobileAuthUserTestMixin,
MobileCourseAccessTestMixin
)
from mobile_api.utils import API_V05, API_V1
from openedx.core.lib.courses import course_image_url
from mobile_api.utils import API_V1, API_V05
from openedx.core.djangoapps.schedules.tests.factories import ScheduleFactory
from openedx.core.lib.courses import course_image_url
from openedx.features.course_duration_limits.models import CourseDurationLimitConfig
from openedx.features.course_experience.tests.views.helpers import add_course_mode
from student.models import CourseEnrollment
@@ -111,7 +115,7 @@ class TestUserEnrollmentApi(UrlResetMixin, MobileAPITestCase, MobileAuthUserTest
self.assertIn('courses/{}/about'.format(self.course.id), found_course['course_about'])
self.assertIn('course_info/{}/updates'.format(self.course.id), found_course['course_updates'])
self.assertIn('course_info/{}/handouts'.format(self.course.id), found_course['course_handouts'])
self.assertEqual(found_course['id'], unicode(self.course.id))
self.assertEqual(found_course['id'], six.text_type(self.course.id))
self.assertEqual(courses[0]['mode'], CourseMode.DEFAULT_MODE_SLUG)
self.assertEqual(courses[0]['course']['subscription_id'], self.course.clean_id(padding_char='_'))
@@ -141,7 +145,7 @@ class TestUserEnrollmentApi(UrlResetMixin, MobileAPITestCase, MobileAuthUserTest
for course_index in range(num_courses):
self.assertEqual(
response.data[course_index]['course']['id'],
unicode(courses[num_courses - course_index - 1].id)
six.text_type(courses[num_courses - course_index - 1].id)
)
@ddt.data(API_V05, API_V1)
@@ -155,7 +159,7 @@ class TestUserEnrollmentApi(UrlResetMixin, MobileAPITestCase, MobileAuthUserTest
course_with_prereq = CourseFactory.create(start=self.LAST_WEEK, mobile_available=True)
prerequisite_course = CourseFactory.create()
set_prerequisite_courses(course_with_prereq.id, [unicode(prerequisite_course.id)])
set_prerequisite_courses(course_with_prereq.id, [six.text_type(prerequisite_course.id)])
# Create list of courses with various expected courseware_access responses and corresponding expected codes
courses = [
@@ -436,11 +440,11 @@ class TestCourseStatusGET(CourseStatusAPITestCase, MobileAuthUserTestMixin,
response = self.api_response()
self.assertEqual(
response.data["last_visited_module_id"],
unicode(self.sub_section.location)
six.text_type(self.sub_section.location)
)
self.assertEqual(
response.data["last_visited_module_path"],
[unicode(module.location) for module in [self.sub_section, self.section, self.course]]
[six.text_type(module.location) for module in [self.sub_section, self.section, self.course]]
)
@@ -455,10 +459,10 @@ class TestCourseStatusPATCH(CourseStatusAPITestCase, MobileAuthUserTestMixin,
def test_success(self):
self.login_and_enroll()
response = self.api_response(data={"last_visited_module_id": unicode(self.other_unit.location)})
response = self.api_response(data={"last_visited_module_id": six.text_type(self.other_unit.location)})
self.assertEqual(
response.data["last_visited_module_id"],
unicode(self.other_sub_section.location)
six.text_type(self.other_sub_section.location)
)
def test_invalid_module(self):
@@ -483,7 +487,7 @@ class TestCourseStatusPATCH(CourseStatusAPITestCase, MobileAuthUserTestMixin,
past_date = datetime.datetime.now()
response = self.api_response(
data={
"last_visited_module_id": unicode(self.other_unit.location),
"last_visited_module_id": six.text_type(self.other_unit.location),
"modification_date": past_date.isoformat()
},
expected_response_code=400
@@ -501,18 +505,18 @@ class TestCourseStatusPATCH(CourseStatusAPITestCase, MobileAuthUserTestMixin,
self.login_and_enroll()
# save something so we have an initial date
self.api_response(data={"last_visited_module_id": unicode(initial_unit.location)})
self.api_response(data={"last_visited_module_id": six.text_type(initial_unit.location)})
# now actually update it
response = self.api_response(
data={
"last_visited_module_id": unicode(update_unit.location),
"last_visited_module_id": six.text_type(update_unit.location),
"modification_date": date.isoformat()
}
)
self.assertEqual(
response.data["last_visited_module_id"],
unicode(expected_subsection.location)
six.text_type(expected_subsection.location)
)
def test_old_date(self):
@@ -529,13 +533,13 @@ class TestCourseStatusPATCH(CourseStatusAPITestCase, MobileAuthUserTestMixin,
self.login_and_enroll()
response = self.api_response(
data={
"last_visited_module_id": unicode(self.other_unit.location),
"last_visited_module_id": six.text_type(self.other_unit.location),
"modification_date": timezone.now().isoformat()
}
)
self.assertEqual(
response.data["last_visited_module_id"],
unicode(self.other_sub_section.location)
six.text_type(self.other_sub_section.location)
)
def test_invalid_date(self):

2
lms/djangoapps/mobile_api/users/urls.py
View File

@@ -2,6 +2,8 @@
URLs for user API
"""
from __future__ import absolute_import
from django.conf import settings
from django.conf.urls import url

6
lms/djangoapps/mobile_api/users/views.py
View File

@@ -2,7 +2,11 @@
Views for user API
"""
from __future__ import absolute_import
import json
import six
from django.shortcuts import redirect
from django.utils import dateparse
from opaque_keys import InvalidKeyError
@@ -140,7 +144,7 @@ class UserCourseStatus(views.APIView):
Returns the course status
"""
path = self._last_visited_module_path(request, course)
path_ids = [unicode(module.location) for module in path]
path_ids = [six.text_type(module.location) for module in path]
return Response({
"last_visited_module_id": path_ids[0],
"last_visited_module_path": path_ids,