From a86b44a2501796757fbb7a6ab628bb4810bfea21 Mon Sep 17 00:00:00 2001 From: aarif Date: Fri, 27 Sep 2019 16:56:41 +0500 Subject: [PATCH] python 3 fixes --- .../management/tests/test_email_opt_in_list.py | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/openedx/core/djangoapps/user_api/management/tests/test_email_opt_in_list.py b/openedx/core/djangoapps/user_api/management/tests/test_email_opt_in_list.py index 34fdc188b3..ecea48ca34 100644 --- a/openedx/core/djangoapps/user_api/management/tests/test_email_opt_in_list.py +++ b/openedx/core/djangoapps/user_api/management/tests/test_email_opt_in_list.py @@ -445,18 +445,14 @@ class EmailOptInListTest(ModuleStoreTestCase): for user, course_id, opt_in_pref in args: self.assertIn({ "user_id": str(user.id), - "username": user.username.encode('utf-8'), - "email": user.email.encode('utf-8'), - "full_name": ( - user.profile.name.encode('utf-8') - if hasattr(user, 'profile') - else '' - ), - "course_id": text_type(course_id).encode('utf-8'), - "is_opted_in_for_email": text_type(opt_in_pref), + "username": user.username, + "email": user.email if six.PY3 else user.email.encode('utf-8'), + "full_name": ((user.profile.name if six.PY3 else user.profile.name.encode('utf-8')) if + hasattr(user, 'profile') else ''), + "course_id": text_type(course_id) if six.PY3 else text_type(course_id).encode('utf-8'), + "is_opted_in_for_email": text_type(opt_in_pref) if six.PY3 else text_type(opt_in_pref).encode('utf-8'), "preference_set_datetime": ( self._latest_pref_set_datetime(self.user) if kwargs.get("expect_pref_datetime", True) - else self.DEFAULT_DATETIME_STR - ) + else self.DEFAULT_DATETIME_STR) }, output[1:])