From dba8a231447061a19b8dff4b2a4fb2ee9d2a8de7 Mon Sep 17 00:00:00 2001 From: aarif Date: Wed, 11 Sep 2019 16:43:21 +0500 Subject: [PATCH] python 3 fixes test fixes changes made as suggested updated the variable name --- lms/djangoapps/courseware/module_render.py | 5 +++-- lms/djangoapps/courseware/tests/test_entrance_exam.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lms/djangoapps/courseware/module_render.py b/lms/djangoapps/courseware/module_render.py index 6f6cce2750..a1442e6f34 100644 --- a/lms/djangoapps/courseware/module_render.py +++ b/lms/djangoapps/courseware/module_render.py @@ -1311,7 +1311,8 @@ def append_data_to_webob_response(response, data): """ if getattr(response, 'content_type', None) == 'application/json': - response_data = json.loads(response.body) + json_input = response.body.decode('utf-8') if isinstance(response.body, bytes) else response.body + response_data = json.loads(json_input) response_data.update(data) - response.body = json.dumps(response_data) + response.body = json.dumps(response_data).encode('utf-8') return response diff --git a/lms/djangoapps/courseware/tests/test_entrance_exam.py b/lms/djangoapps/courseware/tests/test_entrance_exam.py index 2be18bad42..619c350f4a 100644 --- a/lms/djangoapps/courseware/tests/test_entrance_exam.py +++ b/lms/djangoapps/courseware/tests/test_entrance_exam.py @@ -552,7 +552,7 @@ class EntranceExamTestCases(LoginEnrollmentTestCase, ModuleStoreTestCase, Milest 'problem_check', ) self.assertEqual(response.status_code, 200) - self.assertIn('entrance_exam_passed', response.content) + self.assertIn('entrance_exam_passed', response.content.decode('utf-8')) def _assert_chapter_loaded(self, course, chapter): """