From 9740e2e0779dd82bf0c9e698b3c668a4af274650 Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Thu, 19 Sep 2019 14:14:17 -0400 Subject: [PATCH] BOM-618 Don't decode string objects. --- common/lib/xmodule/xmodule/lti_module.py | 2 +- common/lib/xmodule/xmodule/tests/__init__.py | 2 +- .../courseware/management/commands/tests/test_dump_course.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/lib/xmodule/xmodule/lti_module.py b/common/lib/xmodule/xmodule/lti_module.py index 01753cb0d0..302c65413a 100644 --- a/common/lib/xmodule/xmodule/lti_module.py +++ b/common/lib/xmodule/xmodule/lti_module.py @@ -657,7 +657,7 @@ oauth_consumer_key="", oauth_signature="frVp4JuvT1mVXlxktiAUjQ7%2F1cw%3D"'} # so '='' becomes '%3D'. # We send form via browser, so browser will encode it again, # So we need to decode signature back: - params[u'oauth_signature'] = six.moves.urllib.parse.unquote(params[u'oauth_signature']).decode('utf8') + params[u'oauth_signature'] = six.moves.urllib.parse.unquote(params[u'oauth_signature']).encode('utf-8').decode('utf8') # Add LTI parameters to OAuth parameters for sending in form. params.update(body) diff --git a/common/lib/xmodule/xmodule/tests/__init__.py b/common/lib/xmodule/xmodule/tests/__init__.py index 6aab74ede0..2113f76678 100644 --- a/common/lib/xmodule/xmodule/tests/__init__.py +++ b/common/lib/xmodule/xmodule/tests/__init__.py @@ -176,7 +176,7 @@ def mock_render_template(*args, **kwargs): Allows us to not depend on any actual template rendering mechanism, while still returning a unicode object """ - return pprint.pformat((args, kwargs)).decode() + return pprint.pformat((args, kwargs)).encode().decode() class ModelsTest(unittest.TestCase): diff --git a/lms/djangoapps/courseware/management/commands/tests/test_dump_course.py b/lms/djangoapps/courseware/management/commands/tests/test_dump_course.py index 34d50f7021..ebf1c24329 100644 --- a/lms/djangoapps/courseware/management/commands/tests/test_dump_course.py +++ b/lms/djangoapps/courseware/management/commands/tests/test_dump_course.py @@ -88,7 +88,7 @@ class CommandsTestBase(SharedModuleStoreTestCase): def test_dump_course_ids(self): output = self.call_command('dump_course_ids') - dumped_courses = output.decode('utf-8').strip().split('\n') + dumped_courses = output.strip().split('\n') course_ids = {text_type(course_id) for course_id in self.loaded_courses} dumped_ids = set(dumped_courses) self.assertEqual(course_ids, dumped_ids)