From 933a55d92e8b313c56fad683d9fc7cc4ca9b601d Mon Sep 17 00:00:00 2001 From: arbisoft Date: Thu, 22 Aug 2019 15:35:01 +0500 Subject: [PATCH] BOM-399 Fixing encode/decode issues for python3. --- .../contentstore/views/tests/test_transcript_settings.py | 2 +- cms/djangoapps/contentstore/views/transcript_settings.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cms/djangoapps/contentstore/views/tests/test_transcript_settings.py b/cms/djangoapps/contentstore/views/tests/test_transcript_settings.py index 5fb18294d6..c925471223 100644 --- a/cms/djangoapps/contentstore/views/tests/test_transcript_settings.py +++ b/cms/djangoapps/contentstore/views/tests/test_transcript_settings.py @@ -243,7 +243,7 @@ class TranscriptDownloadTest(CourseTestCase): # Assert the actual response self.assertEqual(response.status_code, 200) - self.assertEqual(response.content, expected_content) + self.assertEqual(response.content.decode('utf-8'), expected_content) for attribute, value in six.iteritems(expected_headers): self.assertEqual(response.get(attribute), value) diff --git a/cms/djangoapps/contentstore/views/transcript_settings.py b/cms/djangoapps/contentstore/views/transcript_settings.py index 14db7a2d95..d4457a63f6 100644 --- a/cms/djangoapps/contentstore/views/transcript_settings.py +++ b/cms/djangoapps/contentstore/views/transcript_settings.py @@ -157,7 +157,7 @@ def transcript_download_handler(request): if transcript: name_and_extension = os.path.splitext(transcript['file_name']) basename, file_format = name_and_extension[0], name_and_extension[1][1:] - transcript_filename = '{base_name}.{ext}'.format(base_name=basename.encode('utf8'), ext=Transcript.SRT) + transcript_filename = '{base_name}.{ext}'.format(base_name=basename, ext=Transcript.SRT) transcript_content = Transcript.convert( content=transcript['content'], input_format=file_format,