From f70bc1a03cae66815df63de03e815a4af432e965 Mon Sep 17 00:00:00 2001 From: Ayub khan Date: Mon, 16 Sep 2019 12:17:57 +0500 Subject: [PATCH] BOM-448 python3 compatibility, tests fixes --- cms/templates/settings.html | 2 +- lms/templates/dashboard/_dashboard_course_listing.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cms/templates/settings.html b/cms/templates/settings.html index 1259802c7c..c78eb1eee3 100644 --- a/cms/templates/settings.html +++ b/cms/templates/settings.html @@ -6,7 +6,6 @@ <%namespace name='static' file='static_content.html'/> <%! - import urllib from django.utils.translation import ugettext as _ from contentstore import utils from openedx.core.djangoapps.certificates.api import can_show_certificate_available_date_field @@ -14,6 +13,7 @@ dump_js_escaped_json, js_escaped_string ) from openedx.core.djangolib.markup import HTML, Text + from six.moves.urllib import parse as urllib %> <%block name="header_extras"> diff --git a/lms/templates/dashboard/_dashboard_course_listing.html b/lms/templates/dashboard/_dashboard_course_listing.html index 996b098772..b4468bf21f 100644 --- a/lms/templates/dashboard/_dashboard_course_listing.html +++ b/lms/templates/dashboard/_dashboard_course_listing.html @@ -1,8 +1,8 @@ <%page args="course_overview, enrollment, entitlement, entitlement_session, course_card_index, is_unfulfilled_entitlement, is_fulfilled_entitlement, entitlement_available_sessions, entitlement_expiration_date, entitlement_expired_at, show_courseware_link, cert_status, can_refund_entitlement, can_unenroll, credit_status, show_email_settings, course_mode_info, is_paid_course, is_course_blocked, verification_status, course_requirements, dashboard_index, share_settings, related_programs, display_course_modes_on_dashboard, show_consent_link, enterprise_customer_name, resume_button_url" expression_filter="h"/> <%! -import urllib import six +from six.moves.urllib import parse as urllib from django.utils.translation import ugettext as _ from django.utils.translation import ungettext