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

Python3 Update

Browse Source 
Added future absolute_import
changed unicode() with six.text_type()
This commit is contained in:
usama sadiq
2019-06-25 15:02:49 +05:00
parent 540dd815e6
commit 23b2039c87
5 changed files with 38 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lms/djangoapps/certificates/admin.py
View File

@@ -1,6 +1,8 @@
"""
django admin pages for certificates models
"""
from __future__ import absolute_import
from operator import itemgetter
from config_models.admin import ConfigurationModelAdmin
@@ -31,7 +33,7 @@ class CertificateTemplateForm(forms.ModelForm):
self.fields['organization_id'] = forms.TypedChoiceField(
choices=org_choices, required=False, coerce=int, empty_value=None
)
languages = settings.CERTIFICATE_TEMPLATE_LANGUAGES.items()
languages = list(settings.CERTIFICATE_TEMPLATE_LANGUAGES.items())
lang_choices = sorted(languages, key=itemgetter(1))
lang_choices.insert(0, (None, 'All Languages'))
self.fields['language'] = forms.ChoiceField(

11
lms/djangoapps/certificates/models.py
View File

@@ -45,11 +45,14 @@ Eligibility:
then the student will be issued a certificate regardless of his grade,
unless he has allow_certificate set to False.
"""
from __future__ import absolute_import
import json
import logging
import os
import uuid
import six
from config_models.models import ConfigurationModel
from django.conf import settings
from django.contrib.auth.models import User
@@ -180,12 +183,12 @@ class CertificateWhitelist(models.Model):
result.append({
'id': item.id,
'user_id': item.user.id,
'user_name': unicode(item.user.username),
'user_email': unicode(item.user.email),
'course_id': unicode(item.course_id),
'user_name': six.text_type(item.user.username),
'user_email': six.text_type(item.user.email),
'course_id': six.text_type(item.course_id),
'created': item.created.strftime(u"%B %d, %Y"),
'certificate_generated': certificate_generated and certificate_generated.strftime(u"%B %d, %Y"),
'notes': unicode(item.notes or ''),
'notes': six.text_type(item.notes or ''),
})
return result

45
lms/djangoapps/certificates/queue.py
View File

@@ -1,13 +1,16 @@
"""Interface for adding certificate generation tasks to the XQueue. """
from __future__ import absolute_import
import json
import logging
import random
from uuid import uuid4
import lxml.html
import six
from django.conf import settings
from django.urls import reverse
from django.test.client import RequestFactory
from django.urls import reverse
from lxml.etree import ParserError, XMLSyntaxError
from requests.auth import HTTPBasicAuth
@@ -34,7 +37,7 @@ class XQueueAddToQueueError(Exception):
def __init__(self, error_code, error_msg):
self.error_code = error_code
self.error_msg = error_msg
super(XQueueAddToQueueError, self).__init__(unicode(self))
super(XQueueAddToQueueError, self).__init__(six.text_type(self))
def __unicode__(self):
return (
@@ -133,7 +136,7 @@ class XQueueCertInterface(object):
u"with status '%s' while regenerating certificates. "
),
student.id,
unicode(course_id),
six.text_type(course_id),
certificate.status
)
@@ -152,7 +155,7 @@ class XQueueCertInterface(object):
u"in course '%s' has been changed to '%s'."
),
student.id,
unicode(course_id),
six.text_type(course_id),
certificate.status
)
@@ -226,7 +229,7 @@ class XQueueCertInterface(object):
u"certificates are not allowed for CCX courses."
),
student.id,
unicode(course_id)
six.text_type(course_id)
)
return None
@@ -261,9 +264,9 @@ class XQueueCertInterface(object):
u"the certificate status '%s' is not one of %s."
),
student.id,
unicode(course_id),
six.text_type(course_id),
cert_status,
unicode(valid_statuses)
six.text_type(valid_statuses)
)
return None
@@ -315,7 +318,7 @@ class XQueueCertInterface(object):
u"generate_pdf is: %s"
),
student.username,
unicode(course_id),
six.text_type(course_id),
template_pdf,
template_file,
user_is_verified,
@@ -347,9 +350,9 @@ class XQueueCertInterface(object):
u"The exception was: '%s'"
),
student.id,
unicode(course_id),
six.text_type(course_id),
grade_contents,
unicode(exc)
six.text_type(exc)
)
# Log if the student is whitelisted
@@ -357,7 +360,7 @@ class XQueueCertInterface(object):
LOGGER.info(
u"Student %s is whitelisted in '%s'",
student.id,
unicode(course_id)
six.text_type(course_id)
)
passing = True
else:
@@ -390,7 +393,7 @@ class XQueueCertInterface(object):
u"No certificate generation task was sent to the XQueue."
),
student.id,
unicode(course_id),
six.text_type(course_id),
cert.status
)
return cert
@@ -411,7 +414,7 @@ class XQueueCertInterface(object):
),
student.id,
cert.status,
unicode(course_id)
six.text_type(course_id)
)
return cert
@@ -425,7 +428,7 @@ class XQueueCertInterface(object):
u"Certificate status has been set to unverified"
),
student.id,
unicode(course_id),
six.text_type(course_id),
)
return cert
@@ -437,7 +440,7 @@ class XQueueCertInterface(object):
Generate a certificate for the student. If `generate_pdf` is True,
sends a request to XQueue.
"""
course_id = unicode(course.id)
course_id = six.text_type(course.id)
key = make_hashkey(random.random())
cert.key = key
@@ -465,7 +468,7 @@ class XQueueCertInterface(object):
self._send_to_xqueue(contents, key)
except XQueueAddToQueueError as exc:
cert.status = ExampleCertificate.STATUS_ERROR
cert.error_reason = unicode(exc)
cert.error_reason = six.text_type(exc)
cert.save()
LOGGER.critical(
(
@@ -504,7 +507,7 @@ class XQueueCertInterface(object):
"""
contents = {
'action': 'create',
'course_id': unicode(example_cert.course_key),
'course_id': six.text_type(example_cert.course_key),
'name': example_cert.full_name,
'template_pdf': example_cert.template,
@@ -539,14 +542,14 @@ class XQueueCertInterface(object):
except XQueueAddToQueueError as exc:
example_cert.update_status(
ExampleCertificate.STATUS_ERROR,
error_reason=unicode(exc)
error_reason=six.text_type(exc)
)
LOGGER.critical(
(
u"Could not add example certificate with uuid '%s' to XQueue. "
u"The exception was %s. "
u"The example certificate has been marked with status 'error'."
), example_cert.uuid, unicode(exc)
), example_cert.uuid, six.text_type(exc)
)
def _send_to_xqueue(self, contents, key, task_identifier=None, callback_url_path='/update_certificate'):
@@ -596,7 +599,7 @@ class XQueueCertInterface(object):
header=xheader, body=json.dumps(contents))
if error:
exc = XQueueAddToQueueError(error, msg)
LOGGER.critical(unicode(exc))
LOGGER.critical(six.text_type(exc))
raise exc
def _log_pdf_cert_generation_discontinued_warning(self, student_id, course_id, cert_status, download_url):
@@ -610,7 +613,7 @@ class XQueueCertInterface(object):
u"and download_url '%s'."
),
student_id,
unicode(course_id),
six.text_type(course_id),
cert_status,
download_url
)

3
lms/djangoapps/certificates/tasks.py
View File

@@ -1,6 +1,7 @@
from __future__ import absolute_import
from celery import task
from logging import getLogger
from celery_utils.persist_on_failure import LoggedPersistOnFailureTask
from django.contrib.auth.models import User
from lms.djangoapps.verify_student.services import IDVerificationService

2
lms/djangoapps/certificates/urls.py
View File

@@ -1,6 +1,8 @@
"""
URLs for the certificates app.
"""
from __future__ import absolute_import
from django.conf import settings
from django.conf.urls import url