BOM-448

python3 compatibility, tests fixes

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">

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