From e66a7a90e5d5a608f5fddade98fa66cf81caaa5d Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Thu, 8 Aug 2019 15:25:58 -0400 Subject: [PATCH 1/2] Byte string doesn't have a format function in python 3 --- lms/djangoapps/shoppingcart/tests/test_reports.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lms/djangoapps/shoppingcart/tests/test_reports.py b/lms/djangoapps/shoppingcart/tests/test_reports.py index 8b5a42688e..002b936926 100644 --- a/lms/djangoapps/shoppingcart/tests/test_reports.py +++ b/lms/djangoapps/shoppingcart/tests/test_reports.py @@ -108,11 +108,11 @@ class ReportTypeTests(ModuleStoreTestCase): second_refund.refund_requested_time = self.test_time second_refund.save() - self.CORRECT_REFUND_REPORT_CSV = dedent(b""" + self.CORRECT_REFUND_REPORT_CSV = dedent(u""" Order Number,Customer Name,Date of Original Transaction,Date of Refund,Amount of Refund,Service Fees (if any) 3,King Bowsér,{time_str},{time_str},40.00,0.00 4,Súsan Smith,{time_str},{time_str},40.00,0.00 - """.format(time_str=str(self.test_time))) + """.format(time_str=str(self.test_time))).encode('utf-8') self.CORRECT_CERT_STATUS_CSV = dedent(""" University,Course,Course Announce Date,Course Start Date,Course Registration Close Date,Course Registration Period,Total Enrolled,Audit Enrollment,Honor Code Enrollment,Verified Enrollment,Gross Revenue,Gross Revenue over the Minimum,Number of Verified Students Contributing More than the Minimum,Number of Refunds,Dollars Refunded From 890e11995113fe929014ed25078d6c89c21fc1c7 Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Mon, 12 Aug 2019 10:16:37 -0400 Subject: [PATCH 2/2] Remove import of nested. We stopped using it but forgot to remove it from the import. --- common/lib/xmodule/xmodule/tests/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/lib/xmodule/xmodule/tests/__init__.py b/common/lib/xmodule/xmodule/tests/__init__.py index a7533107cd..a1c8322616 100644 --- a/common/lib/xmodule/xmodule/tests/__init__.py +++ b/common/lib/xmodule/xmodule/tests/__init__.py @@ -16,7 +16,7 @@ import pprint import sys import traceback import unittest -from contextlib import contextmanager, nested +from contextlib import contextmanager from functools import wraps import six