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

INCR-376 python3 compatibility

Browse Source
This commit is contained in:
Ayub khan
2019-07-10 15:04:04 +05:00
parent 92c7a43011
commit 7ffccff0f3
8 changed files with 44 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
openedx/core/djangoapps/ccxcon/api.py
View File

@@ -2,9 +2,12 @@
Module containing API functions for the CCXCon
"""
import logging
import urlparse
from __future__ import absolute_import
import logging
import six
import six.moves.urllib.parse # pylint: disable=import-error
from django.core.exceptions import ValidationError
from django.core.validators import URLValidator
from django.http import Http404
@@ -90,18 +93,18 @@ def course_info_to_ccxcon(course_key):
try:
course = get_course_by_id(course_key)
except Http404:
log.error(u'Master Course with key "%s" not found', unicode(course_key))
log.error(u'Master Course with key "%s" not found', six.text_type(course_key))
return
if not course.enable_ccx:
log.debug(u'ccx not enabled for course key "%s"', unicode(course_key))
log.debug(u'ccx not enabled for course key "%s"', six.text_type(course_key))
return
if not course.ccx_connector:
log.debug(u'ccx connector not defined for course key "%s"', unicode(course_key))
log.debug(u'ccx connector not defined for course key "%s"', six.text_type(course_key))
return
if not is_valid_url(course.ccx_connector):
log.error(
u'ccx connector URL "%s" for course key "%s" is not a valid URL.',
course.ccx_connector, unicode(course_key)
course.ccx_connector, six.text_type(course_key)
)
return
# get the oauth credential for this URL
@@ -114,7 +117,7 @@ def course_info_to_ccxcon(course_key):
# get an oauth client with a valid token
oauth_ccxcon = get_oauth_client(
server_token_url=urlparse.urljoin(course.ccx_connector, CCXCON_TOKEN_URL),
server_token_url=six.moves.urllib.parse.urljoin(course.ccx_connector, CCXCON_TOKEN_URL),
client_id=ccxcon.oauth_client_id,
client_secret=ccxcon.oauth_client_secret
)
@@ -127,7 +130,7 @@ def course_info_to_ccxcon(course_key):
course_details = CourseDetails.fetch(course_key)
payload = {
'course_id': unicode(course_key),
'course_id': six.text_type(course_key),
'title': course.display_name,
'author_name': None,
'overview': course_details.overview,
@@ -138,7 +141,7 @@ def course_info_to_ccxcon(course_key):
headers = {'content-type': 'application/json'}
# make the POST request
add_course_url = urlparse.urljoin(course.ccx_connector, CCXCON_COURSEXS_URL)
add_course_url = six.moves.urllib.parse.urljoin(course.ccx_connector, CCXCON_COURSEXS_URL)
resp = oauth_ccxcon.post(
url=add_course_url,
json=payload,