From 19ea7c3875eadc3610d5ad3b1b1c986aaddcf3fa Mon Sep 17 00:00:00 2001 From: arbisoft Date: Thu, 29 Aug 2019 20:27:15 +0500 Subject: [PATCH] BOM-115 Fixing python3 --- lms/djangoapps/courseware/tests/test_about.py | 2 +- lms/templates/courseware/course_about_sidebar_header.html | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lms/djangoapps/courseware/tests/test_about.py b/lms/djangoapps/courseware/tests/test_about.py index 7f49ba3d6f..56a90a64cb 100644 --- a/lms/djangoapps/courseware/tests/test_about.py +++ b/lms/djangoapps/courseware/tests/test_about.py @@ -293,7 +293,7 @@ class AboutTestCaseXML(LoginEnrollmentTestCase, ModuleStoreTestCase): url = reverse('about_course', args=[text_type(self.xml_course_id)]) resp = self.client.get(url) self.assertEqual(resp.status_code, 200) - self.assertIn(self.xml_data, resp.content) + self.assertIn(self.xml_data, resp.content.decode('utf-8')) @patch.dict('django.conf.settings.FEATURES', {'DISABLE_START_DATES': False}) def test_anonymous_user_xml(self): diff --git a/lms/templates/courseware/course_about_sidebar_header.html b/lms/templates/courseware/course_about_sidebar_header.html index 281ef98137..d58d8a1b88 100644 --- a/lms/templates/courseware/course_about_sidebar_header.html +++ b/lms/templates/courseware/course_about_sidebar_header.html @@ -1,7 +1,7 @@ <%page expression_filter="h"/> <%namespace name='static' file='../static_content.html'/> <%! -import urllib +import six from django.utils.translation import ugettext as _ from django.urls import reverse @@ -33,7 +33,7 @@ from six import text_type path=reverse('about_course', args=[text_type(course.id)]) ) ).replace(u" ", u"+") - tweet_action = u"http://twitter.com/intent/tweet?text={tweet_text}".format(tweet_text=urllib.quote_plus(tweet_text.encode('UTF-8'))) + tweet_action = u"http://twitter.com/intent/tweet?text={tweet_text}".format(tweet_text=six.moves.urllib.parse.quote_plus(tweet_text.encode('UTF-8'))) facebook_link = static.get_value('course_about_facebook_link', settings.PLATFORM_FACEBOOK_ACCOUNT) @@ -50,8 +50,8 @@ from six import text_type email_subject = _("Take a course with {platform} online").format(platform=platform_name) email_link = u"mailto:?subject={subject}&body={body}".format( - subject=urllib.quote_plus(email_subject.encode('UTF-8')), - body=urllib.quote_plus(email_body.encode('UTF-8')) + subject=six.moves.urllib.parse.quote_plus(email_subject.encode('UTF-8')), + body=six.moves.urllib.parse.quote_plus(email_body.encode('UTF-8')) ) %>