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

Merge pull request #20972 from edx/INCR-463/python-modernize-360-of-380

Browse Source 
Python-modernize on edx-platform (360 of 380)
This commit is contained in:
Uzair Rasheed
2019-07-10 19:03:43 +05:00
committed by GitHub
parent 9a1bb49910 a0629f4f14
commit a917f109ec
6 changed files with 34 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/djangoapps/shoppingcart/admin.py
View File

@@ -1,4 +1,6 @@
"""Django admin interface for the shopping cart models. """
from __future__ import absolute_import
from django.contrib import admin
from shoppingcart.models import (

2
lms/djangoapps/shoppingcart/api.py
View File

@@ -1,6 +1,8 @@
"""
API for for getting information about the user's shopping cart.
"""
from __future__ import absolute_import
from django.urls import reverse
from shoppingcart.models import OrderItem

45
lms/djangoapps/shoppingcart/models.py
View File

@@ -1,6 +1,8 @@
# pylint: disable=arguments-differ
""" Models for the shopping cart and assorted purchase types """
from __future__ import absolute_import
import csv
import json
import logging
@@ -12,6 +14,7 @@ from decimal import Decimal
from io import BytesIO
import pytz
import six
from boto.exception import BotoServerError # this is a super-class of SESError and catches connection errors
from config_models.models import ConfigurationModel
from django.conf import settings
@@ -19,22 +22,22 @@ from django.contrib.auth.models import User
from django.core.exceptions import ObjectDoesNotExist
from django.core.mail import send_mail
from django.core.mail.message import EmailMessage
from django.urls import reverse
from django.db import models, transaction
from django.db.models import Count, F, Q, Sum
from django.db.models.signals import post_delete, post_save
from django.dispatch import receiver
from django.urls import reverse
from django.utils.translation import ugettext as _
from django.utils.translation import ugettext_lazy
from model_utils.managers import InheritanceManager
from model_utils.models import TimeStampedModel
from opaque_keys.edx.django.models import CourseKeyField
from six import text_type
from six.moves import range
from course_modes.models import CourseMode
from courseware.courses import get_course_by_id
from edxmako.shortcuts import render_to_string
from eventtracking import tracker
from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
from openedx.core.djangolib.markup import HTML, Text
from shoppingcart.pdf import PDFInvoice
@@ -349,7 +352,7 @@ class Order(models.Model):
for registration_code in registration_codes:
redemption_url = reverse('register_code_redemption', args=[registration_code.code])
url = '{base_url}{redemption_url}'.format(base_url=site_name, redemption_url=redemption_url)
csv_writer.writerow([unicode(course.display_name).encode("utf-8"), registration_code.code, url])
csv_writer.writerow([six.text_type(course.display_name).encode("utf-8"), registration_code.code, url])
return csv_file, course_names
@@ -596,10 +599,10 @@ class Order(models.Model):
we throw an UnexpectedOrderItemStatus error)
"""
# if an order is already retired, no-op:
if self.status in ORDER_STATUS_MAP.values():
if self.status in list(ORDER_STATUS_MAP.values()):
return
if self.status not in ORDER_STATUS_MAP.keys():
if self.status not in list(ORDER_STATUS_MAP.keys()):
raise InvalidStatusToRetire(
u"order status {order_status} is not 'paying' or 'cart'".format(
order_status=self.status
@@ -960,7 +963,7 @@ class Invoice(TimeStampedModel):
def __unicode__(self):
label = (
unicode(self.internal_reference)
six.text_type(self.internal_reference)
if self.internal_reference
else u"No label"
)
@@ -1079,7 +1082,7 @@ class InvoiceTransaction(TimeStampedModel):
"""
return {
'amount': unicode(self.amount),
'amount': six.text_type(self.amount),
'currency': self.currency,
'comments': self.comments,
'status': self.status,
@@ -1133,7 +1136,7 @@ class InvoiceItem(TimeStampedModel):
"""
return {
'qty': self.qty,
'unit_price': unicode(self.unit_price),
'unit_price': six.text_type(self.unit_price),
'currency': self.currency
}
@@ -1161,7 +1164,7 @@ class CourseRegistrationCodeInvoiceItem(InvoiceItem):
"""
snapshot = super(CourseRegistrationCodeInvoiceItem, self).snapshot()
snapshot['course_id'] = unicode(self.course_id)
snapshot['course_id'] = six.text_type(self.course_id)
return snapshot
@@ -1674,10 +1677,10 @@ class PaidCourseRegistration(OrderItem):
data = super(PaidCourseRegistration, self).analytics_data()
sku = data['sku']
if self.course_id != CourseKeyField.Empty:
data['name'] = unicode(self.course_id)
data['category'] = unicode(self.course_id.org)
data['name'] = six.text_type(self.course_id)
data['category'] = six.text_type(self.course_id.org)
if self.mode:
data['sku'] = sku + u'.' + unicode(self.mode)
data['sku'] = sku + u'.' + six.text_type(self.mode)
return data
@@ -1841,10 +1844,10 @@ class CourseRegCodeItem(OrderItem):
data = super(CourseRegCodeItem, self).analytics_data()
sku = data['sku']
if self.course_id != CourseKeyField.Empty:
data['name'] = unicode(self.course_id)
data['category'] = unicode(self.course_id.org)
data['name'] = six.text_type(self.course_id)
data['category'] = six.text_type(self.course_id.org)
if self.mode:
data['sku'] = sku + u'.' + unicode(self.mode)
data['sku'] = sku + u'.' + six.text_type(self.mode)
return data
@@ -2033,7 +2036,7 @@ class CertificateItem(OrderItem):
if is_enrollment_mode_verified:
domain = configuration_helpers.get_value('SITE_NAME', settings.SITE_NAME)
path = reverse('verify_student_verify_now', kwargs={'course_id': unicode(self.course_id)})
path = reverse('verify_student_verify_now', kwargs={'course_id': six.text_type(self.course_id)})
verification_url = "http://{domain}{path}".format(domain=domain, path=path)
verification_reminder = _(
@@ -2107,10 +2110,10 @@ class CertificateItem(OrderItem):
data = super(CertificateItem, self).analytics_data()
sku = data['sku']
if self.course_id != CourseKeyField.Empty:
data['name'] = unicode(self.course_id)
data['category'] = unicode(self.course_id.org)
data['name'] = six.text_type(self.course_id)
data['category'] = six.text_type(self.course_id.org)
if self.mode:
data['sku'] = sku + u'.' + unicode(self.mode)
data['sku'] = sku + u'.' + six.text_type(self.mode)
return data
@@ -2288,8 +2291,8 @@ class Donation(OrderItem):
"""
data = super(Donation, self).analytics_data()
if self.course_id != CourseKeyField.Empty:
data['name'] = unicode(self.course_id)
data['category'] = unicode(self.course_id.org)
data['name'] = six.text_type(self.course_id)
data['category'] = six.text_type(self.course_id.org)
else:
data['name'] = configuration_helpers.get_value('PLATFORM_NAME', settings.PLATFORM_NAME)
data['category'] = configuration_helpers.get_value('PLATFORM_NAME', settings.PLATFORM_NAME)

2
lms/djangoapps/shoppingcart/pdf.py
View File

@@ -1,6 +1,8 @@
"""
Template for PDF Receipt/Invoice Generation
"""
from __future__ import absolute_import
import logging
from django.conf import settings

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

@@ -2,6 +2,8 @@
Defines the shoppingcart URLs
"""
from __future__ import absolute_import
from django.conf import settings
from django.conf.urls import url

2
lms/djangoapps/shoppingcart/utils.py
View File

@@ -2,6 +2,8 @@
Utility methods for the Shopping Cart app
"""
from __future__ import absolute_import
from django.conf import settings
from pdfminer.converter import PDFPageAggregator
from pdfminer.layout import LAParams, LTFigure, LTTextBox, LTTextLine