{msg}
'.format(msg=msg) + return HTML(u'{msg}
').format(msg=msg) CARDTYPE_MAP = defaultdict(lambda: "UNKNOWN") @@ -664,7 +665,7 @@ REASONCODE_MAP.update( """)), '233': _('General decline by the processor. Possible action: retry with another form of payment.'), '234': _( - "There is a problem with the information in your CyberSource account. Please let us know at {0}" + u"There is a problem with the information in your CyberSource account. Please let us know at {0}" ).format(settings.PAYMENT_SUPPORT_EMAIL), '235': _('The requested capture amount exceeds the originally authorized amount.'), '236': _('Processor Failure. Possible action: retry the payment'), diff --git a/lms/djangoapps/shoppingcart/processors/tests/test_CyberSource2.py b/lms/djangoapps/shoppingcart/processors/tests/test_CyberSource2.py index 5f07ebddfd..c3b7738036 100644 --- a/lms/djangoapps/shoppingcart/processors/tests/test_CyberSource2.py +++ b/lms/djangoapps/shoppingcart/processors/tests/test_CyberSource2.py @@ -80,7 +80,7 @@ class CyberSource2Test(TestCase): # Parameters determined by the order model self.assertEqual(params['amount'], '10.00') self.assertEqual(params['currency'], 'usd') - self.assertEqual(params['orderNumber'], 'OrderId: {order_id}'.format(order_id=self.order.id)) + self.assertEqual(params['orderNumber'], u'OrderId: {order_id}'.format(order_id=self.order.id)) self.assertEqual(params['reference_number'], self.order.id) # Parameters determined by the Django (test) settings @@ -149,7 +149,7 @@ class CyberSource2Test(TestCase): # Expect that we processed the payment successfully self.assertTrue( result['success'], - msg="Payment was not successful: {error}".format(error=result.get('error_html')) + msg=u"Payment was not successful: {error}".format(error=result.get('error_html')) ) self.assertEqual(result['error_html'], '') @@ -232,7 +232,7 @@ class CyberSource2Test(TestCase): # Expect that we processed the payment successfully self.assertTrue( result['success'], - msg="Payment was not successful: {error}".format(error=result.get('error_html')) + msg=u"Payment was not successful: {error}".format(error=result.get('error_html')) ) self.assertEqual(result['error_html'], '') self.assert_dump_recorded(result['order']) diff --git a/lms/djangoapps/shoppingcart/tests/test_pdf.py b/lms/djangoapps/shoppingcart/tests/test_pdf.py index fb03bcf619..4f044d1236 100644 --- a/lms/djangoapps/shoppingcart/tests/test_pdf.py +++ b/lms/djangoapps/shoppingcart/tests/test_pdf.py @@ -59,7 +59,7 @@ class TestPdfFile(unittest.TestCase): return the dictionary with the dummy data """ return { - 'item_description': 'Course %s Description' % index, + 'item_description': u'Course %s Description' % index, 'quantity': index, 'list_price': 10, 'discount': discount, diff --git a/lms/djangoapps/shoppingcart/tests/test_reports.py b/lms/djangoapps/shoppingcart/tests/test_reports.py index a53150b284..995e39ef4f 100644 --- a/lms/djangoapps/shoppingcart/tests/test_reports.py +++ b/lms/djangoapps/shoppingcart/tests/test_reports.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- - """ Tests for the Shopping Cart Models """ @@ -242,7 +241,7 @@ class ItemizedPurchaseReportTest(ModuleStoreTestCase): """ # delete the matching annotation self.annotation.delete() - self.assertEqual(u"", self.reg.csv_report_comments) + self.assertEqual("", self.reg.csv_report_comments) def test_paidcourseregistrationannotation_unicode(self): """ diff --git a/lms/djangoapps/shoppingcart/tests/test_views.py b/lms/djangoapps/shoppingcart/tests/test_views.py index 7d478eddde..23b480b0c1 100644 --- a/lms/djangoapps/shoppingcart/tests/test_views.py +++ b/lms/djangoapps/shoppingcart/tests/test_views.py @@ -288,7 +288,7 @@ class ShoppingCartViewsTests(SharedModuleStoreTestCase, XssTestMixin): self.login_user() resp = self.client.post(reverse('add_course_to_cart', args=[text_type(self.course_key)])) self.assertEqual(resp.status_code, 400) - self.assertIn('The course {0} is already in your cart.'.format(text_type(self.course_key)), resp.content) + self.assertIn(u'The course {0} is already in your cart.'.format(text_type(self.course_key)), resp.content) def test_course_discount_invalid_coupon(self): self.add_coupon(self.course_key, True, self.coupon_code) @@ -296,7 +296,7 @@ class ShoppingCartViewsTests(SharedModuleStoreTestCase, XssTestMixin): non_existing_code = "non_existing_code" resp = self.client.post(reverse('shoppingcart.views.use_code'), {'code': non_existing_code}) self.assertEqual(resp.status_code, 404) - self.assertIn("Discount does not exist against code '{0}'.".format(non_existing_code), resp.content) + self.assertIn(u"Discount does not exist against code '{0}'.".format(non_existing_code), resp.content) def test_valid_qty_greater_then_one_and_purchase_type_should_business(self): qty = 2 @@ -418,14 +418,14 @@ class ShoppingCartViewsTests(SharedModuleStoreTestCase, XssTestMixin): non_existing_code = "non_existing_code" resp = self.client.post(reverse('shoppingcart.views.use_code'), {'code': non_existing_code}) self.assertEqual(resp.status_code, 404) - self.assertIn("Discount does not exist against code '{0}'.".format(non_existing_code), resp.content) + self.assertIn(u"Discount does not exist against code '{0}'.".format(non_existing_code), resp.content) def test_course_discount_inactive_coupon(self): self.add_coupon(self.course_key, False, self.coupon_code) self.add_course_to_user_cart(self.course_key) resp = self.client.post(reverse('shoppingcart.views.use_code'), {'code': self.coupon_code}) self.assertEqual(resp.status_code, 404) - self.assertIn("Discount does not exist against code '{0}'.".format(self.coupon_code), resp.content) + self.assertIn(u"Discount does not exist against code '{0}'.".format(self.coupon_code), resp.content) def test_course_does_not_exist_in_cart_against_valid_coupon(self): course_key = text_type(self.course_key) + 'testing' @@ -434,7 +434,7 @@ class ShoppingCartViewsTests(SharedModuleStoreTestCase, XssTestMixin): resp = self.client.post(reverse('shoppingcart.views.use_code'), {'code': self.coupon_code}) self.assertEqual(resp.status_code, 404) - self.assertIn("Discount does not exist against code '{0}'.".format(self.coupon_code), resp.content) + self.assertIn(u"Discount does not exist against code '{0}'.".format(self.coupon_code), resp.content) def test_inactive_registration_code_returns_error(self): """ @@ -450,7 +450,7 @@ class ShoppingCartViewsTests(SharedModuleStoreTestCase, XssTestMixin): resp = self.client.post(reverse('shoppingcart.views.use_code'), {'code': self.reg_code}) self.assertEqual(resp.status_code, 400) self.assertIn( - "This enrollment code ({enrollment_code}) is no longer valid.".format( + u"This enrollment code ({enrollment_code}) is no longer valid.".format( enrollment_code=self.reg_code), resp.content) def test_course_does_not_exist_in_cart_against_valid_reg_code(self): @@ -460,7 +460,7 @@ class ShoppingCartViewsTests(SharedModuleStoreTestCase, XssTestMixin): resp = self.client.post(reverse('shoppingcart.views.use_code'), {'code': self.reg_code}) self.assertEqual(resp.status_code, 404) - self.assertIn("Code '{0}' is not valid for any course in the shopping cart.".format(self.reg_code), resp.content) + self.assertIn(u"Code '{0}' is not valid for any course in the shopping cart.".format(self.reg_code), resp.content) def test_cart_item_qty_greater_than_1_against_valid_reg_code(self): course_key = text_type(self.course_key) @@ -611,7 +611,7 @@ class ShoppingCartViewsTests(SharedModuleStoreTestCase, XssTestMixin): # the item has been removed when using the registration code for the first time resp = self.client.post(reverse('shoppingcart.views.use_code'), {'code': self.reg_code}) self.assertEqual(resp.status_code, 400) - self.assertIn("This enrollment code ({enrollment_code}) is not valid.".format( + self.assertIn(u"This enrollment code ({enrollment_code}) is not valid.".format( enrollment_code=self.reg_code ), resp.content) @@ -649,7 +649,7 @@ class ShoppingCartViewsTests(SharedModuleStoreTestCase, XssTestMixin): resp = self.client.post(reverse('shoppingcart.views.remove_item', args=[]), {'id': reg_item.id}) debug_log.assert_called_with( - 'Code redemption does not exist for order item id=%s.', + u'Code redemption does not exist for order item id=%s.', str(reg_item.id) ) @@ -671,7 +671,7 @@ class ShoppingCartViewsTests(SharedModuleStoreTestCase, XssTestMixin): self.assertEqual(resp.status_code, 200) self.assertEquals(self.cart.orderitem_set.count(), 0) info_log.assert_called_with( - 'Coupon "%s" redemption entry removed for user "%s" for order item "%s"', + u'Coupon "%s" redemption entry removed for user "%s" for order item "%s"', self.coupon_code, self.user, str(reg_item.id) @@ -690,7 +690,7 @@ class ShoppingCartViewsTests(SharedModuleStoreTestCase, XssTestMixin): self.assertEqual(resp.status_code, 200) info_log.assert_called_with( - 'Coupon redemption entry removed for user %s for order %s', + u'Coupon redemption entry removed for user %s for order %s', self.user, reg_item.id ) @@ -724,7 +724,7 @@ class ShoppingCartViewsTests(SharedModuleStoreTestCase, XssTestMixin): self.assertEqual(resp.status_code, 200) self.assertEquals(self.cart.orderitem_set.count(), 1) info_log.assert_called_with( - 'Coupon "%s" redemption entry removed for user "%s" for order item "%s"', + 'Coupon "%s" redemption entry removed for user "%s" for order item "%s"', # pylint: disable=unicode-format-string,line-too-long self.coupon_code, self.user, str(reg_item.id) @@ -743,7 +743,7 @@ class ShoppingCartViewsTests(SharedModuleStoreTestCase, XssTestMixin): self.assertEqual(resp.status_code, 200) self.assertEquals(self.cart.orderitem_set.count(), 1) - info_log.assert_called_with("order item %s removed for user %s", str(cert_item.id), self.user) + info_log.assert_called_with(u"order item %s removed for user %s", str(cert_item.id), self.user) @patch('shoppingcart.views.log.info') def test_remove_coupon_redemption_on_clear_cart(self, info_log): @@ -761,7 +761,7 @@ class ShoppingCartViewsTests(SharedModuleStoreTestCase, XssTestMixin): self.assertEquals(self.cart.orderitem_set.count(), 0) info_log.assert_called_with( - 'Coupon redemption entry removed for user %s for order %s', + u'Coupon redemption entry removed for user %s for order %s', self.user, reg_item.id ) @@ -771,7 +771,7 @@ class ShoppingCartViewsTests(SharedModuleStoreTestCase, XssTestMixin): self.login_user() resp = self.client.post(reverse('add_course_to_cart', args=[text_type(self.course_key)])) self.assertEqual(resp.status_code, 400) - self.assertIn('You are already registered in course {0}.'.format(text_type(self.course_key)), resp.content) + self.assertIn(u'You are already registered in course {0}.'.format(text_type(self.course_key)), resp.content) def test_add_nonexistent_course_to_cart(self): self.login_user() @@ -864,7 +864,7 @@ class ShoppingCartViewsTests(SharedModuleStoreTestCase, XssTestMixin): {'id': cert_item.id}) self.assertEqual(resp2.status_code, 200) exception_log.assert_called_with( - 'Cannot remove cart OrderItem id=%s. DoesNotExist or item is already purchased', str(cert_item.id) + u'Cannot remove cart OrderItem id=%s. DoesNotExist or item is already purchased', str(cert_item.id) ) resp3 = self.client.post( @@ -873,7 +873,7 @@ class ShoppingCartViewsTests(SharedModuleStoreTestCase, XssTestMixin): ) self.assertEqual(resp3.status_code, 200) exception_log.assert_called_with( - 'Cannot remove cart OrderItem id=%s. DoesNotExist or item is already purchased', + u'Cannot remove cart OrderItem id=%s. DoesNotExist or item is already purchased', '-1' ) @@ -936,7 +936,7 @@ class ShoppingCartViewsTests(SharedModuleStoreTestCase, XssTestMixin): 'unit_cost': 40, 'quantity': 1, 'line_cost': 40, - 'line_desc': '{} for course Test Course'.format(self.verified_course_mode.mode_display_name), + 'line_desc': u'{} for course Test Course'.format(self.verified_course_mode.mode_display_name), 'course_key': unicode(self.verified_course_key) }) @@ -1004,7 +1004,7 @@ class ShoppingCartViewsTests(SharedModuleStoreTestCase, XssTestMixin): 'unit_cost': 40, 'quantity': 1, 'line_cost': 40, - 'line_desc': '{} for course Test Course'.format(self.verified_course_mode.mode_display_name), + 'line_desc': u'{} for course Test Course'.format(self.verified_course_mode.mode_display_name), 'course_key': unicode(self.verified_course_key) }) @@ -1266,14 +1266,17 @@ class ShoppingCartViewsTests(SharedModuleStoreTestCase, XssTestMixin): self.assertFalse(context['reg_code_info_list'][0]['is_redeemed']) self.assertFalse(context['reg_code_info_list'][1]['is_redeemed']) - self.assertIn(self.cart.purchase_time.strftime("%B %d, %Y"), resp.content) + self.assertIn(self.cart.purchase_time.strftime(u"%B %d, %Y"), resp.content) self.assertIn(self.cart.company_name, resp.content) self.assertIn(self.cart.company_contact_name, resp.content) self.assertIn(self.cart.company_contact_email, resp.content) self.assertIn(self.cart.recipient_email, resp.content) - self.assertIn("Invoice #{order_id}".format(order_id=self.cart.id), resp.content) - self.assertIn('You have successfully purchased {total_registration_codes} course registration codes' - .format(total_registration_codes=context['total_registration_codes']), resp.content) + self.assertIn(u"Invoice #{order_id}".format(order_id=self.cart.id), resp.content.decode(resp.charset)) + codes_string = u'You have successfully purchased {total_registration_codes} course registration codes' + self.assertIn(codes_string.format( + total_registration_codes=context['total_registration_codes']), + resp.content.decode(resp.charset) + ) # now redeem one of registration code from the previous order redeem_url = reverse('register_code_redemption', args=[context['reg_code_info_list'][0]['code']]) @@ -1638,7 +1641,9 @@ class ShoppingcartViewsClosedEnrollment(ModuleStoreTestCase): # coupon redemption entry should also be deleted when the item is expired. resp = self.client.get(reverse('shoppingcart.views.show_cart', args=[])) self.assertEqual(resp.status_code, 200) - self.assertIn("{course_name} has been removed because the enrollment period has closed.".format(course_name=self.testing_course.display_name), resp.content) + self.assertIn(u"{course_name} has been removed because the enrollment period has closed.".format( + course_name=self.testing_course.display_name), resp.content.decode(resp.charset) + ) # now the redemption entry should be deleted from the table. coupon_redemption = CouponRedemption.objects.filter(coupon__course_id=expired_course_item.course_id, @@ -1678,7 +1683,12 @@ class ShoppingcartViewsClosedEnrollment(ModuleStoreTestCase): resp = self.client.get(reverse('shoppingcart.views.show_cart', args=[])) self.assertEqual(resp.status_code, 200) - self.assertIn("{course_name} has been removed because the enrollment period has closed.".format(course_name=self.testing_course.display_name), resp.content) + self.assertIn( + u"{course_name} has been removed because the enrollment period has closed.".format( + course_name=self.testing_course.display_name + ), + resp.content.decode(resp.charset) + ) self.assertIn('40.00', resp.content) def test_is_enrollment_closed_when_order_type_is_business(self): @@ -1701,7 +1711,12 @@ class ShoppingcartViewsClosedEnrollment(ModuleStoreTestCase): # so we delete that item from the cart and display the message in the cart resp = self.client.get(reverse('shoppingcart.views.show_cart', args=[])) self.assertEqual(resp.status_code, 200) - self.assertIn("{course_name} has been removed because the enrollment period has closed.".format(course_name=self.testing_course.display_name), resp.content) + self.assertIn( + u"{course_name} has been removed because the enrollment period has closed.".format( + course_name=self.testing_course.display_name + ), + resp.content.decode(resp.charset) + ) self.assertIn('40.00', resp.content) diff --git a/lms/djangoapps/shoppingcart/views.py b/lms/djangoapps/shoppingcart/views.py index 5f22048649..afeaff1d2c 100644 --- a/lms/djangoapps/shoppingcart/views.py +++ b/lms/djangoapps/shoppingcart/views.py @@ -117,10 +117,10 @@ def add_course_to_cart(request, course_id): except CourseDoesNotExistException: return HttpResponseNotFound(_('The course you requested does not exist.')) except ItemAlreadyInCartException: - return HttpResponseBadRequest(_('The course {course_id} is already in your cart.').format(course_id=course_id)) + return HttpResponseBadRequest(_(u'The course {course_id} is already in your cart.').format(course_id=course_id)) except AlreadyEnrolledInCourseException: return HttpResponseBadRequest( - _('You are already registered in course {course_id}.').format(course_id=course_id)) + _(u'You are already registered in course {course_id}.').format(course_id=course_id)) else: # in case a coupon redemption code has been applied, new items should also get a discount if applicable. order = paid_course_item.order @@ -293,7 +293,7 @@ def use_code(request): try: course_reg = CourseRegistrationCode.objects.get(code=code) except CourseRegistrationCode.DoesNotExist: - return HttpResponseNotFound(_("Discount does not exist against code '{code}'.").format(code=code)) + return HttpResponseNotFound(_(u"Discount does not exist against code '{code}'.").format(code=code)) return use_registration_code(course_reg, request.user) @@ -318,7 +318,7 @@ def get_reg_code_validity(registration_code, request, limiter): reg_code_already_redeemed = RegistrationCodeRedemption.is_registration_code_redeemed(registration_code) if not reg_code_is_valid: # tick the rate limiter counter - AUDIT_LOG.info("Redemption of a invalid RegistrationCode %s", registration_code) + AUDIT_LOG.info(u"Redemption of a invalid RegistrationCode %s", registration_code) limiter.tick_bad_request_counter(request) raise Http404() @@ -465,7 +465,7 @@ def use_registration_code(course_reg, user): if not course_reg.is_valid: log.warning(u"The enrollment code (%s) is no longer valid.", course_reg.code) return HttpResponseBadRequest( - _("This enrollment code ({enrollment_code}) is no longer valid.").format( + _(u"This enrollment code ({enrollment_code}) is no longer valid.").format( enrollment_code=course_reg.code ) ) @@ -473,7 +473,7 @@ def use_registration_code(course_reg, user): if RegistrationCodeRedemption.is_registration_code_redeemed(course_reg.code): log.warning(u"This enrollment code ({%s}) has already been used.", course_reg.code) return HttpResponseBadRequest( - _("This enrollment code ({enrollment_code}) is not valid.").format( + _(u"This enrollment code ({enrollment_code}) is not valid.").format( enrollment_code=course_reg.code ) ) @@ -483,7 +483,7 @@ def use_registration_code(course_reg, user): except ItemNotFoundInCartException: log.warning(u"Course item does not exist against registration code '%s'", course_reg.code) return HttpResponseNotFound( - _("Code '{registration_code}' is not valid for any course in the shopping cart.").format( + _(u"Code '{registration_code}' is not valid for any course in the shopping cart.").format( registration_code=course_reg.code ) ) @@ -521,7 +521,7 @@ def use_coupon_code(coupons, user): if not is_redemption_applied: log.warning(u"Discount does not exist against code '%s'.", coupons[0].code) - return HttpResponseNotFound(_("Discount does not exist against code '{code}'.").format(code=coupons[0].code)) + return HttpResponseNotFound(_(u"Discount does not exist against code '{code}'.").format(code=coupons[0].code)) return HttpResponse( json.dumps({'response': 'success', 'coupon_code_applied': True}), @@ -950,7 +950,7 @@ def _show_receipt_html(request, order): 'currency': settings.PAID_COURSE_REGISTRATION_CURRENCY[0], 'total_registration_codes': total_registration_codes, 'reg_code_info_list': reg_code_info_list, - 'order_purchase_date': order.purchase_time.strftime("%B %d, %Y"), + 'order_purchase_date': order.purchase_time.strftime(u"%B %d, %Y"), } # We want to have the ability to override the default receipt page when @@ -1022,8 +1022,8 @@ def csv_report(request): items = report.rows() response = HttpResponse(content_type='text/csv') - filename = "purchases_report_{}.csv".format(datetime.datetime.now(pytz.UTC).strftime("%Y-%m-%d-%H-%M-%S")) - response['Content-Disposition'] = 'attachment; filename="{}"'.format(filename) + filename = u"purchases_report_{}.csv".format(datetime.datetime.now(pytz.UTC).strftime(u"%Y-%m-%d-%H-%M-%S")) + response['Content-Disposition'] = u'attachment; filename="{}"'.format(filename) report.write_csv(response) return response diff --git a/lms/djangoapps/static_template_view/tests/test_views.py b/lms/djangoapps/static_template_view/tests/test_views.py index ed8f00e488..f4c998a79d 100644 --- a/lms/djangoapps/static_template_view/tests/test_views.py +++ b/lms/djangoapps/static_template_view/tests/test_views.py @@ -119,7 +119,7 @@ class MarketingSiteViewTests(TestCase): resp = self.client.get(url, HTTP_HOST=settings.MICROSITE_TEST_HOSTNAME) self.assertContains( resp, - 'There has been a 500 error on the {platform_name} servers'.format( + u'There has been a 500 error on the {platform_name} servers'.format( platform_name=settings.MICROSITE_CONFIGURATION['test_site']['platform_name'] ), status_code=500 diff --git a/lms/djangoapps/staticbook/views.py b/lms/djangoapps/staticbook/views.py index 0ffa909563..2137a30678 100644 --- a/lms/djangoapps/staticbook/views.py +++ b/lms/djangoapps/staticbook/views.py @@ -24,7 +24,7 @@ def index(request, course_id, book_index, page=None): book_index = int(book_index) if book_index < 0 or book_index >= len(course.textbooks): - raise Http404("Invalid book index value: {0}".format(book_index)) + raise Http404(u"Invalid book index value: {0}".format(book_index)) textbook = course.textbooks[book_index] table_of_contents = textbook.table_of_contents @@ -82,7 +82,7 @@ def pdf_index(request, course_id, book_index, chapter=None, page=None): book_index = int(book_index) if book_index < 0 or book_index >= len(course.pdf_textbooks): - raise Http404("Invalid book index value: {0}".format(book_index)) + raise Http404(u"Invalid book index value: {0}".format(book_index)) textbook = course.pdf_textbooks[book_index] viewer_params = '&file=' @@ -150,7 +150,7 @@ def html_index(request, course_id, book_index, chapter=None): book_index = int(book_index) if book_index < 0 or book_index >= len(course.html_textbooks): - raise Http404("Invalid book index value: {0}".format(book_index)) + raise Http404(u"Invalid book index value: {0}".format(book_index)) textbook = course.html_textbooks[book_index] if 'url' in textbook: diff --git a/lms/djangoapps/support/tests/test_refund.py b/lms/djangoapps/support/tests/test_refund.py index 5446d3b6a9..8f47cab648 100644 --- a/lms/djangoapps/support/tests/test_refund.py +++ b/lms/djangoapps/support/tests/test_refund.py @@ -107,7 +107,7 @@ class RefundTests(ModuleStoreTestCase): def test_no_order(self): self._enroll(purchase=False) response = self.client.post('/support/refund/', self.form_pars) - self.assertContains(response, 'No order found for %s' % self.student.username) + self.assertContains(response, u'No order found for %s' % self.student.username) def test_valid_order(self): self._enroll() @@ -124,7 +124,7 @@ class RefundTests(ModuleStoreTestCase): self.assertTrue(response.status_code, 302) response = self.client.get(response.get('location')) - self.assertContains(response, "Unenrolled %s from" % self.student) + self.assertContains(response, u"Unenrolled %s from" % self.student) self.assertContains(response, "Refunded 1.00 for order id") self.assertFalse(CourseEnrollment.is_enrolled(self.student, self.course_id)) diff --git a/lms/djangoapps/support/views/refund.py b/lms/djangoapps/support/views/refund.py index 1c13e0cd31..2617c1b6bc 100644 --- a/lms/djangoapps/support/views/refund.py +++ b/lms/djangoapps/support/views/refund.py @@ -60,7 +60,7 @@ class RefundForm(forms.Form): if user and course_id: self.cleaned_data['enrollment'] = enrollment = CourseEnrollment.get_or_create_enrollment(user, course_id) if enrollment.refundable(): - msg = _("Course {course_id} not past the refund window.").format(course_id=course_id) + msg = _(u"Course {course_id} not past the refund window.").format(course_id=course_id) raise forms.ValidationError(msg) try: self.cleaned_data['cert'] = enrollment.certificateitem_set.filter( @@ -68,7 +68,7 @@ class RefundForm(forms.Form): status='purchased' )[0] except IndexError: - msg = _("No order found for {user} in course {course_id}").format(user=user, course_id=course_id) + msg = _(u"No order found for {user} in course {course_id}").format(user=user, course_id=course_id) raise forms.ValidationError(msg) return self.cleaned_data @@ -125,14 +125,14 @@ class RefundSupportView(FormView): log.info(u"%s manually refunded %s %s", self.request.user, user, course_id) messages.success( self.request, - _("Unenrolled {user} from {course_id}").format( + _(u"Unenrolled {user} from {course_id}").format( user=user, course_id=course_id ) ) messages.success( self.request, - _("Refunded {cost} for order id {order_id}").format( + _(u"Refunded {cost} for order id {order_id}").format( cost=cert.unit_cost, order_id=cert.order.id ) diff --git a/lms/djangoapps/survey/models.py b/lms/djangoapps/survey/models.py index a8fa845bdd..e7500c7878 100644 --- a/lms/djangoapps/survey/models.py +++ b/lms/djangoapps/survey/models.py @@ -11,6 +11,7 @@ from lxml import etree from model_utils.models import TimeStampedModel from opaque_keys.edx.django.models import CourseKeyField +from openedx.core.djangolib.markup import HTML from student.models import User from survey.exceptions import SurveyFormNameAlreadyExists, SurveyFormNotFound @@ -52,8 +53,8 @@ class SurveyForm(TimeStampedModel): try: fields = cls.get_field_names_from_html(html) except Exception as ex: - log.exception("Cannot parse SurveyForm html: {}".format(ex)) - raise ValidationError("Cannot parse SurveyForm as HTML: {}".format(ex)) + log.exception(u"Cannot parse SurveyForm html: {}".format(ex)) + raise ValidationError(u"Cannot parse SurveyForm as HTML: {}".format(ex)) if not len(fields): raise ValidationError("SurveyForms must contain at least one form input field") @@ -146,7 +147,7 @@ class SurveyForm(TimeStampedModel): # make sure the form is wrap in some outer single element # otherwise lxml can't parse it # NOTE: This wrapping doesn't change the ability to query it - tree = etree.fromstring(u'{}
'.format(html))
+ tree = etree.fromstring(HTML(u'{}
').format(HTML(html)))
input_fields = (
tree.findall('.//input') + tree.findall('.//select') +
diff --git a/lms/djangoapps/teams/management/commands/tests/test_reindex_course_team.py b/lms/djangoapps/teams/management/commands/tests/test_reindex_course_team.py
index 7253bf9912..acb8bece08 100644
--- a/lms/djangoapps/teams/management/commands/tests/test_reindex_course_team.py
+++ b/lms/djangoapps/teams/management/commands/tests/test_reindex_course_team.py
@@ -62,7 +62,7 @@ class ReindexCourseTeamTest(SharedModuleStoreTestCase):
Test that raises CommandError for invalid team id.
"""
team_id = u'team4'
- error_str = 'Argument {} is not a course_team team_id'.format(team_id)
+ error_str = u'Argument {} is not a course_team team_id'.format(team_id)
with self.assertRaisesRegexp(CommandError, error_str):
call_command('reindex_course_team', team_id)
diff --git a/lms/djangoapps/teams/models.py b/lms/djangoapps/teams/models.py
index d91225d193..4064dd0567 100644
--- a/lms/djangoapps/teams/models.py
+++ b/lms/djangoapps/teams/models.py
@@ -198,7 +198,7 @@ class CourseTeamMembership(models.Model):
# Allow it *only* if the current value is None.
if current_value is not None:
raise ImmutableMembershipFieldException(
- "Field %r shouldn't change from %r to %r" % (name, current_value, value)
+ u"Field %r shouldn't change from %r to %r" % (name, current_value, value)
)
super(CourseTeamMembership, self).__setattr__(name, value)
diff --git a/lms/djangoapps/teams/search_indexes.py b/lms/djangoapps/teams/search_indexes.py
index 187f5a9d5c..a94a4b9792 100644
--- a/lms/djangoapps/teams/search_indexes.py
+++ b/lms/djangoapps/teams/search_indexes.py
@@ -120,7 +120,7 @@ class CourseTeamIndexer(object):
try:
return SearchEngine.get_search_engine(index=cls.INDEX_NAME)
except ConnectionError as err:
- logging.error('Error connecting to elasticsearch: %s', err)
+ logging.error(u'Error connecting to elasticsearch: %s', err)
raise ElasticSearchConnectionError
@classmethod
diff --git a/lms/djangoapps/teams/tests/factories.py b/lms/djangoapps/teams/tests/factories.py
index a4991df4c2..750a06f0f3 100644
--- a/lms/djangoapps/teams/tests/factories.py
+++ b/lms/djangoapps/teams/tests/factories.py
@@ -23,7 +23,7 @@ class CourseTeamFactory(DjangoModelFactory):
team_id = factory.Sequence('team-{0}'.format)
discussion_topic_id = factory.LazyAttribute(lambda a: uuid4().hex)
- name = factory.Sequence("Awesome Team {0}".format)
+ name = factory.Sequence(u"Awesome Team {0}".format)
description = "A simple description"
last_activity_at = LAST_ACTIVITY_AT
diff --git a/lms/djangoapps/teams/tests/test_views.py b/lms/djangoapps/teams/tests/test_views.py
index 4cc1d794ce..d0696f2570 100644
--- a/lms/djangoapps/teams/tests/test_views.py
+++ b/lms/djangoapps/teams/tests/test_views.py
@@ -46,9 +46,9 @@ class TestDashboard(SharedModuleStoreTestCase):
"max_team_size": 10,
"topics": [
{
- "name": "Topic {}".format(topic_id),
+ "name": u"Topic {}".format(topic_id),
"id": topic_id,
- "description": "Description for topic {}".format(topic_id)
+ "description": u"Description for topic {}".format(topic_id)
}
for topic_id in range(cls.NUM_TOPICS)
]
@@ -178,19 +178,17 @@ class TestDashboard(SharedModuleStoreTestCase):
# Check that initially list of user teams in course one is empty
course_one_teams_url = reverse('teams_dashboard', args=[self.course.id])
response = self.client.get(course_one_teams_url)
- self.assertIn('"teams": {"count": 0', response.content)
-
+ self.assertIn('"teams": {"count": 0', response.content) # pylint: disable=unicode-format-string
# Add user to a course one team
course_one_team.add_user(self.user)
# Check that list of user teams in course one is not empty, it is one now
response = self.client.get(course_one_teams_url)
- self.assertIn('"teams": {"count": 1', response.content)
-
+ self.assertIn('"teams": {"count": 1', response.content) # pylint: disable=unicode-format-string
# Check that list of user teams in course two is still empty
course_two_teams_url = reverse('teams_dashboard', args=[course_two.id])
response = self.client.get(course_two_teams_url)
- self.assertIn('"teams": {"count": 0', response.content)
+ self.assertIn('"teams": {"count": 0', response.content) # pylint: disable=unicode-format-string
class TeamAPITestCase(APITestCase, SharedModuleStoreTestCase):
@@ -209,7 +207,7 @@ class TeamAPITestCase(APITestCase, SharedModuleStoreTestCase):
{
'id': 'topic_{}'.format(i),
'name': name,
- 'description': 'Description for topic {}.'.format(i)
+ 'description': u'Description for topic {}.'.format(i)
} for i, name in enumerate([u'Sólar power', 'Wind Power', 'Nuclear Power', 'Coal Power'])
]
}
@@ -407,10 +405,10 @@ class TeamAPITestCase(APITestCase, SharedModuleStoreTestCase):
self.assertEqual(
expected_status,
response.status_code,
- msg="Expected status {expected} but got {actual}: {content}".format(
+ msg=u"Expected status {expected} but got {actual}: {content}".format(
expected=expected_status,
actual=response.status_code,
- content=response.content,
+ content=response.content.decode(response.charset),
)
)
diff --git a/lms/djangoapps/teams/views.py b/lms/djangoapps/teams/views.py
index cd7ff037f3..5a392ec739 100644
--- a/lms/djangoapps/teams/views.py
+++ b/lms/djangoapps/teams/views.py
@@ -372,7 +372,7 @@ class TeamsListView(ExpandableFieldViewMixin, GenericAPIView):
result_filter.update({'course_id': course_key})
except InvalidKeyError:
error = build_api_error(
- ugettext_noop("The supplied course id {course_id} is not valid."),
+ ugettext_noop(u"The supplied course id {course_id} is not valid."),
course_id=course_id_string,
)
return Response(error, status=status.HTTP_400_BAD_REQUEST)
@@ -399,7 +399,7 @@ class TeamsListView(ExpandableFieldViewMixin, GenericAPIView):
if topic_id is not None:
if topic_id not in [topic['id'] for topic in course_module.teams_configuration['topics']]:
error = build_api_error(
- ugettext_noop('The supplied topic id {topic_id} is not valid'),
+ ugettext_noop(u'The supplied topic id {topic_id} is not valid'),
topic_id=topic_id
)
return Response(error, status=status.HTTP_400_BAD_REQUEST)
@@ -448,7 +448,7 @@ class TeamsListView(ExpandableFieldViewMixin, GenericAPIView):
queryset = queryset.order_by('-last_activity_at', 'team_size')
else:
return Response({
- 'developer_message': "unsupported order_by value {ordering}".format(ordering=order_by_input),
+ 'developer_message': u"unsupported order_by value {ordering}".format(ordering=order_by_input),
# Translators: 'ordering' is a string describing a way
# of ordering a list. For example, {ordering} may be
# 'name', indicating that the user wants to sort the
@@ -477,7 +477,7 @@ class TeamsListView(ExpandableFieldViewMixin, GenericAPIView):
return Response(status=status.HTTP_404_NOT_FOUND)
except InvalidKeyError:
field_errors['course_id'] = build_api_error(
- ugettext_noop('The supplied course_id {course_id} is not valid.'),
+ ugettext_noop(u'The supplied course_id {course_id} is not valid.'),
course_id=course_id
)
return Response({
@@ -673,7 +673,7 @@ class TeamsDetailView(ExpandableFieldViewMixin, RetrievePatchAPIView):
# Note: also deletes all team memberships associated with this team
team.delete()
- log.info('user %d deleted team %s', request.user.id, team_id)
+ log.info(u'user %d deleted team %s', request.user.id, team_id)
emit_team_event('edx.team.deleted', team.course_id, {
'team_id': team_id,
})
@@ -755,7 +755,7 @@ class TopicListView(GenericAPIView):
return Response({
'field_errors': {
'course_id': build_api_error(
- ugettext_noop("The supplied course id {course_id} is not valid."),
+ ugettext_noop(u"The supplied course id {course_id} is not valid."),
course_id=course_id_string
)
}
@@ -777,7 +777,7 @@ class TopicListView(GenericAPIView):
ordering = request.query_params.get('order_by', 'name')
if ordering not in ['name', 'team_count']:
return Response({
- 'developer_message': "unsupported order_by value {ordering}".format(ordering=ordering),
+ 'developer_message': u"unsupported order_by value {ordering}".format(ordering=ordering),
# Translators: 'ordering' is a string describing a way
# of ordering a list. For example, {ordering} may be
# 'name', indicating that the user wants to sort the
@@ -1125,7 +1125,7 @@ class MembershipListView(ExpandableFieldViewMixin, GenericAPIView):
except AlreadyOnTeamInCourse:
return Response(
build_api_error(
- ugettext_noop("The user {username} is already a member of a team in this course."),
+ ugettext_noop(u"The user {username} is already a member of a team in this course."),
username=username
),
status=status.HTTP_400_BAD_REQUEST
@@ -1133,7 +1133,7 @@ class MembershipListView(ExpandableFieldViewMixin, GenericAPIView):
except NotEnrolledInCourseForTeam:
return Response(
build_api_error(
- ugettext_noop("The user {username} is not enrolled in the course associated with this team."),
+ ugettext_noop(u"The user {username} is not enrolled in the course associated with this team."),
username=username
),
status=status.HTTP_400_BAD_REQUEST
diff --git a/lms/djangoapps/verify_student/management/commands/manual_verifications.py b/lms/djangoapps/verify_student/management/commands/manual_verifications.py
index 37421332fd..304042239a 100644
--- a/lms/djangoapps/verify_student/management/commands/manual_verifications.py
+++ b/lms/djangoapps/verify_student/management/commands/manual_verifications.py
@@ -48,9 +48,9 @@ class Command(BaseCommand):
len(failed_emails),
total_emails
))
- log.error('Failed emails:{}'.format(pformat(failed_emails)))
+ log.error(u'Failed emails:{}'.format(pformat(failed_emails)))
else:
- log.info('Successfully generated manual verification for {} emails.'.format(total_emails))
+ log.info(u'Successfully generated manual verification for {} emails.'.format(total_emails))
def _generate_manual_verification_from_file(self, email_ids_file):
"""
diff --git a/lms/djangoapps/verify_student/management/commands/retry_failed_photo_verifications.py b/lms/djangoapps/verify_student/management/commands/retry_failed_photo_verifications.py
index a100a5cf33..598c868286 100644
--- a/lms/djangoapps/verify_student/management/commands/retry_failed_photo_verifications.py
+++ b/lms/djangoapps/verify_student/management/commands/retry_failed_photo_verifications.py
@@ -30,14 +30,14 @@ class Command(BaseCommand):
attempts_to_retry = SoftwareSecurePhotoVerification.objects.filter(status='must_retry')
force_must_retry = False
- print("Attempting to retry {0} failed PhotoVerification submissions".format(len(attempts_to_retry)))
+ print(u"Attempting to retry {0} failed PhotoVerification submissions".format(len(attempts_to_retry)))
for index, attempt in enumerate(attempts_to_retry):
- print("Retrying submission #{0} (ID: {1}, User: {2})".format(index, attempt.id, attempt.user))
+ print(u"Retrying submission #{0} (ID: {1}, User: {2})".format(index, attempt.id, attempt.user))
# Set the attempts status to 'must_retry' so that we can re-submit it
if force_must_retry:
attempt.status = 'must_retry'
attempt.submit(copy_id_photo_from=attempt.copy_id_photo_from)
- print("Retry result: {0}".format(attempt.status))
+ print(u"Retry result: {0}".format(attempt.status))
print("Done resubmitting failed photo verifications")
diff --git a/lms/djangoapps/verify_student/models.py b/lms/djangoapps/verify_student/models.py
index f333b01888..83f7d58342 100644
--- a/lms/djangoapps/verify_student/models.py
+++ b/lms/djangoapps/verify_student/models.py
@@ -649,7 +649,7 @@ class SoftwareSecurePhotoVerification(PhotoVerification):
self.save()
except Exception: # pylint: disable=broad-except
log.exception(
- 'Software Secure submission failed for user %s, setting status to must_retry',
+ u'Software Secure submission failed for user %s, setting status to must_retry',
self.user.username
)
self.status = "must_retry"
@@ -695,9 +695,9 @@ class SoftwareSecurePhotoVerification(PhotoVerification):
if parsed_error:
parsed_errors.append(parsed_error)
else:
- log.debug('Ignoring photo verification error message: %s', message)
+ log.debug(u'Ignoring photo verification error message: %s', message)
except Exception: # pylint: disable=broad-except
- log.exception('Failed to parse error message for SoftwareSecurePhotoVerification %d', self.pk)
+ log.exception(u'Failed to parse error message for SoftwareSecurePhotoVerification %d', self.pk)
return parsed_errors
@@ -836,7 +836,7 @@ class SoftwareSecurePhotoVerification(PhotoVerification):
headers, body = self.create_request()
header_txt = "\n".join(
- "{}: {}".format(h, v) for h, v in sorted(headers.items())
+ u"{}: {}".format(h, v) for h, v in sorted(headers.items())
)
body_txt = json.dumps(body, indent=2, sort_keys=True, ensure_ascii=False).encode('utf-8')
@@ -873,20 +873,20 @@ class SoftwareSecurePhotoVerification(PhotoVerification):
verify=False
)
- log.info("Sent request to Software Secure for receipt ID %s.", self.receipt_id)
+ log.info(u"Sent request to Software Secure for receipt ID %s.", self.receipt_id)
if copy_id_photo_from is not None:
log.info(
(
- "Software Secure attempt with receipt ID %s used the same photo ID "
- "data as the receipt with ID %s"
+ u"Software Secure attempt with receipt ID %s used the same photo ID "
+ u"data as the receipt with ID %s"
),
self.receipt_id, copy_id_photo_from.receipt_id
)
log.debug("Headers:\n{}\n\n".format(headers))
log.debug("Body:\n{}\n\n".format(body))
- log.debug("Return code: {}".format(response.status_code))
- log.debug("Return message:\n\n{}\n\n".format(response.text))
+ log.debug(u"Return code: {}".format(response.status_code))
+ log.debug(u"Return message:\n\n{}\n\n".format(response.text))
return response
@@ -923,7 +923,7 @@ class VerificationDeadline(TimeStampedModel):
deadline = models.DateTimeField(
help_text=ugettext_lazy(
u"The datetime after which users are no longer allowed "
- u"to submit photos for verification."
+ "to submit photos for verification."
)
)
diff --git a/lms/djangoapps/verify_student/services.py b/lms/djangoapps/verify_student/services.py
index 59c01951e7..f815a9cf90 100644
--- a/lms/djangoapps/verify_student/services.py
+++ b/lms/djangoapps/verify_student/services.py
@@ -194,7 +194,7 @@ class IDVerificationService(object):
if attempt.created_at < earliest_allowed_verification_date():
if user_status['should_display']:
user_status['status'] = 'expired'
- user_status['error'] = _("Your {platform_name} verification has expired.").format(
+ user_status['error'] = _(u"Your {platform_name} verification has expired.").format(
platform_name=configuration_helpers.get_value('platform_name', settings.PLATFORM_NAME),
)
else:
diff --git a/lms/djangoapps/verify_student/ssencrypt.py b/lms/djangoapps/verify_student/ssencrypt.py
index b8c29d8a3e..e7aeeba37f 100644
--- a/lms/djangoapps/verify_student/ssencrypt.py
+++ b/lms/djangoapps/verify_student/ssencrypt.py
@@ -149,12 +149,12 @@ def has_valid_signature(method, headers_dict, body_dict, access_key, secret_key)
if post_access_key != access_key:
log.error("Posted access key does not match ours")
- log.debug("Their access: %s; Our access: %s", post_access_key, access_key)
+ log.debug(u"Their access: %s; Our access: %s", post_access_key, access_key)
return False
if post_signature != expected_signature:
log.error("Posted signature does not match expected")
- log.debug("Their sig: %s; Expected: %s", post_signature, expected_signature)
+ log.debug(u"Their sig: %s; Expected: %s", post_signature, expected_signature)
return False
return True
@@ -169,7 +169,7 @@ def generate_signed_message(method, headers_dict, body_dict, access_key, secret_
# hmac needs a byte string for it's starting key, can't be unicode.
hashed = hmac.new(secret_key.encode('utf-8'), message, sha256)
signature = binascii.b2a_base64(hashed.digest()).rstrip('\n')
- authorization_header = "SSI {}:{}".format(access_key, signature)
+ authorization_header = u"SSI {}:{}".format(access_key, signature)
message += '\n'
return message, signature, authorization_header
diff --git a/lms/djangoapps/verify_student/tasks.py b/lms/djangoapps/verify_student/tasks.py
index ceb5ac858d..63fe41a421 100644
--- a/lms/djangoapps/verify_student/tasks.py
+++ b/lms/djangoapps/verify_student/tasks.py
@@ -37,4 +37,4 @@ def send_verification_status_email(context):
fail_silently=False
)
except SMTPException:
- log.warning("Failure in sending verification status e-mail to %s", dest_addr)
+ log.warning(u"Failure in sending verification status e-mail to %s", dest_addr)
diff --git a/lms/djangoapps/verify_student/tests/fake_software_secure.py b/lms/djangoapps/verify_student/tests/fake_software_secure.py
index cbae6181e8..f587f0bb38 100644
--- a/lms/djangoapps/verify_student/tests/fake_software_secure.py
+++ b/lms/djangoapps/verify_student/tests/fake_software_secure.py
@@ -35,7 +35,7 @@ class SoftwareSecureFakeView(View):
access_key = settings.VERIFY_STUDENT["SOFTWARE_SECURE"]["API_ACCESS_KEY"]
context = {
'receipt_id': None,
- 'authorization_code': 'SIS {}:0000'.format(access_key),
+ 'authorization_code': u'SIS {}:0000'.format(access_key),
'results_callback': reverse('verify_student_results_callback')
}
diff --git a/lms/djangoapps/verify_student/tests/test_models.py b/lms/djangoapps/verify_student/tests/test_models.py
index be256b584b..ab8fee466b 100644
--- a/lms/djangoapps/verify_student/tests/test_models.py
+++ b/lms/djangoapps/verify_student/tests/test_models.py
@@ -234,7 +234,7 @@ class TestPhotoVerification(TestVerification, MockS3Mixin, ModuleStoreTestCase):
self.assertEqual(attempt.status, "must_retry")
logger.check(
('lms.djangoapps.verify_student.models', 'ERROR',
- 'Software Secure submission failed for user %s, setting status to must_retry'
+ u'Software Secure submission failed for user %s, setting status to must_retry'
% attempt.user.username))
@mock.patch.dict(settings.FEATURES, {'AUTOMATIC_VERIFY_STUDENT_IDENTITY_FOR_TESTING': True})
diff --git a/lms/djangoapps/verify_student/tests/test_views.py b/lms/djangoapps/verify_student/tests/test_views.py
index a5c88bd6b0..6c191966c7 100644
--- a/lms/djangoapps/verify_student/tests/test_views.py
+++ b/lms/djangoapps/verify_student/tests/test_views.py
@@ -983,9 +983,9 @@ class TestPayAndVerifyView(UrlResetMixin, ModuleStoreTestCase, XssTestMixin):
response_dict = self._get_page_data(response)
for req, displayed in response_dict['requirements'].iteritems():
if req in requirements:
- self.assertTrue(displayed, msg="Expected '{req}' requirement to be displayed".format(req=req))
+ self.assertTrue(displayed, msg=u"Expected '{req}' requirement to be displayed".format(req=req))
else:
- self.assertFalse(displayed, msg="Expected '{req}' requirement to be hidden".format(req=req))
+ self.assertFalse(displayed, msg=u"Expected '{req}' requirement to be hidden".format(req=req))
def _assert_course_details(self, response, course_key, display_name, url):
"""Check the course information on the page. """
@@ -1629,7 +1629,7 @@ class TestSubmitPhotosForVerification(TestCase):
"""
if expect_email:
# Verify that photo submission confirmation email was sent
- subject = _("{platform_name} ID Verification Photos Received").format(
+ subject = _(u"{platform_name} ID Verification Photos Received").format(
platform_name=settings.PLATFORM_NAME
)
self.assertEqual(len(mail.outbox), 1)
diff --git a/lms/djangoapps/verify_student/views.py b/lms/djangoapps/verify_student/views.py
index 27d8e7c1d8..db601878b1 100644
--- a/lms/djangoapps/verify_student/views.py
+++ b/lms/djangoapps/verify_student/views.py
@@ -711,7 +711,7 @@ class PayAndVerifyView(View):
"""
if deadline_name not in [self.VERIFICATION_DEADLINE, self.UPGRADE_DEADLINE]:
- log.error("Invalid deadline name %s. Skipping check for whether the deadline passed.", deadline_name)
+ log.error(u"Invalid deadline name %s. Skipping check for whether the deadline passed.", deadline_name)
return None
deadline_passed = (
@@ -743,7 +743,7 @@ def checkout_with_ecommerce_service(user, course_key, course_mode, processor):
return result.get('payment_data')
except SlumberBaseException:
params = {'username': user.username, 'mode': course_mode.slug, 'course_id': course_id}
- log.exception('Failed to create order for %(username)s %(mode)s mode of %(course_id)s', params)
+ log.exception(u'Failed to create order for %(username)s %(mode)s mode of %(course_id)s', params)
raise
finally:
audit_log(
@@ -951,7 +951,7 @@ class SubmitPhotosView(View):
if "photo_id_image" not in params and not has_initial_verification:
log.error(
(
- "User %s does not have an initial verification attempt "
+ u"User %s does not have an initial verification attempt "
"and no photo ID image data was provided. "
"This most likely means that the JavaScript client is not "
"correctly constructing the request to submit photos."
@@ -993,7 +993,7 @@ class SubmitPhotosView(View):
return HttpResponseBadRequest(_("No profile found for user"))
except AccountValidationError:
msg = _(
- "Name must be at least {min_length} characters long."
+ u"Name must be at least {min_length} characters long."
).format(min_length=NAME_MIN_LENGTH)
return HttpResponseBadRequest(msg)
@@ -1071,7 +1071,7 @@ class SubmitPhotosView(View):
'platform_name': configuration_helpers.get_value("PLATFORM_NAME", settings.PLATFORM_NAME)
}
- subject = _("{platform_name} ID Verification Photos Received").format(platform_name=context['platform_name'])
+ subject = _(u"{platform_name} ID Verification Photos Received").format(platform_name=context['platform_name'])
message = render_to_string('emails/photo_submission_confirmation.txt', context)
from_address = configuration_helpers.get_value('email_from_address', settings.DEFAULT_FROM_EMAIL)
to_address = user.email
@@ -1082,7 +1082,7 @@ class SubmitPhotosView(View):
# We catch all exceptions and log them.
# It would be much, much worse to roll back the transaction due to an uncaught
# exception than to skip sending the notification email.
- log.exception("Could not send notification email for initial verification for user %s", user.id)
+ log.exception(u"Could not send notification email for initial verification for user %s", user.id)
def _fire_event(self, user, event_name, parameters):
"""
@@ -1111,12 +1111,12 @@ def results_callback(request):
try:
body_dict = json.loads(body)
except ValueError:
- log.exception("Invalid JSON received from Software Secure:\n\n{}\n".format(body))
- return HttpResponseBadRequest("Invalid JSON. Received:\n\n{}".format(body))
+ log.exception(u"Invalid JSON received from Software Secure:\n\n{}\n".format(body))
+ return HttpResponseBadRequest(u"Invalid JSON. Received:\n\n{}".format(body))
if not isinstance(body_dict, dict):
- log.error("Reply from Software Secure is not a dict:\n\n{}\n".format(body))
- return HttpResponseBadRequest("JSON should be dict. Received:\n\n{}".format(body))
+ log.error(u"Reply from Software Secure is not a dict:\n\n{}\n".format(body))
+ return HttpResponseBadRequest(u"JSON should be dict. Received:\n\n{}".format(body))
headers = {
"Authorization": request.META.get("HTTP_AUTHORIZATION", ""),
@@ -1150,23 +1150,23 @@ def results_callback(request):
try:
attempt = SoftwareSecurePhotoVerification.objects.get(receipt_id=receipt_id)
except SoftwareSecurePhotoVerification.DoesNotExist:
- log.error("Software Secure posted back for receipt_id %s, but not found", receipt_id)
- return HttpResponseBadRequest("edX ID {} not found".format(receipt_id))
+ log.error(u"Software Secure posted back for receipt_id %s, but not found", receipt_id)
+ return HttpResponseBadRequest(u"edX ID {} not found".format(receipt_id))
user = attempt.user
verification_status_email_vars = {
'platform_name': settings.PLATFORM_NAME,
}
if result == "PASS":
- log.debug("Approving verification for %s", receipt_id)
+ log.debug(u"Approving verification for %s", receipt_id)
attempt.approve()
- status = "approved"
+ status = u"approved"
expiry_date = datetime.date.today() + datetime.timedelta(
days=settings.VERIFY_STUDENT["DAYS_GOOD_FOR"]
)
verification_status_email_vars['expiry_date'] = expiry_date.strftime("%m/%d/%Y")
verification_status_email_vars['full_name'] = user.profile.name
- subject = _("Your {platform_name} ID Verification Approved").format(
+ subject = _(u"Your {platform_name} ID Verification Approved").format(
platform_name=settings.PLATFORM_NAME
)
context = {
@@ -1178,14 +1178,14 @@ def results_callback(request):
send_verification_status_email.delay(context)
elif result == "FAIL":
- log.debug("Denying verification for %s", receipt_id)
+ log.debug(u"Denying verification for %s", receipt_id)
attempt.deny(json.dumps(reason), error_code=error_code)
status = "denied"
reverify_url = '{}{}'.format(settings.LMS_ROOT_URL, reverse("verify_student_reverify"))
verification_status_email_vars['reasons'] = reason
verification_status_email_vars['reverify_url'] = reverify_url
verification_status_email_vars['faq_url'] = settings.ID_VERIFICATION_SUPPORT_LINK
- subject = _("Your {platform_name} Verification Has Been Denied").format(
+ subject = _(u"Your {platform_name} Verification Has Been Denied").format(
platform_name=settings.PLATFORM_NAME
)
context = {
@@ -1197,14 +1197,14 @@ def results_callback(request):
send_verification_status_email.delay(context)
elif result == "SYSTEM FAIL":
- log.debug("System failure for %s -- resetting to must_retry", receipt_id)
+ log.debug(u"System failure for %s -- resetting to must_retry", receipt_id)
attempt.system_error(json.dumps(reason), error_code=error_code)
status = "error"
- log.error("Software Secure callback attempt for %s failed: %s", receipt_id, reason)
+ log.error(u"Software Secure callback attempt for %s failed: %s", receipt_id, reason)
else:
- log.error("Software Secure returned unknown result %s", result)
+ log.error(u"Software Secure returned unknown result %s", result)
return HttpResponseBadRequest(
- "Result {} not understood. Known results: PASS, FAIL, SYSTEM FAIL".format(result)
+ u"Result {} not understood. Known results: PASS, FAIL, SYSTEM FAIL".format(result)
)
return HttpResponse("OK!")
diff --git a/lms/envs/aws.py b/lms/envs/aws.py
index 932550d6c2..5492b7d197 100644
--- a/lms/envs/aws.py
+++ b/lms/envs/aws.py
@@ -375,7 +375,7 @@ if "TRACKING_IGNORE_URL_PATTERNS" in ENV_TOKENS:
SSL_AUTH_EMAIL_DOMAIN = ENV_TOKENS.get("SSL_AUTH_EMAIL_DOMAIN", "MIT.EDU")
SSL_AUTH_DN_FORMAT_STRING = ENV_TOKENS.get(
"SSL_AUTH_DN_FORMAT_STRING",
- "/C=US/ST=Massachusetts/O=Massachusetts Institute of Technology/OU=Client CA v1/CN={0}/emailAddress={1}"
+ u"/C=US/ST=Massachusetts/O=Massachusetts Institute of Technology/OU=Client CA v1/CN={0}/emailAddress={1}"
)
# Django CAS external authentication settings
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 7629aebd98..e29afff482 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -2381,28 +2381,28 @@ SOCIAL_MEDIA_FOOTER_DISPLAY = {
# translate this the way that Facebook advertises in your language.
"title": _("Facebook"),
"icon": "fa-facebook-square",
- "action": _("Like {platform_name} on Facebook")
+ "action": _(u"Like {platform_name} on Facebook")
},
"twitter": {
# Translators: This is the website name of www.twitter.com. Please
# translate this the way that Twitter advertises in your language.
"title": _("Twitter"),
"icon": "fa-twitter-square",
- "action": _("Follow {platform_name} on Twitter")
+ "action": _(u"Follow {platform_name} on Twitter")
},
"linkedin": {
# Translators: This is the website name of www.linkedin.com. Please
# translate this the way that LinkedIn advertises in your language.
"title": _("LinkedIn"),
"icon": "fa-linkedin-square",
- "action": _("Follow {platform_name} on LinkedIn")
+ "action": _(u"Follow {platform_name} on LinkedIn")
},
"google_plus": {
# Translators: This is the website name of plus.google.com. Please
# translate this the way that Google+ advertises in your language.
"title": _("Google+"),
"icon": "fa-google-plus-square",
- "action": _("Follow {platform_name} on Google+")
+ "action": _(u"Follow {platform_name} on Google+")
},
"tumblr": {
# Translators: This is the website name of www.tumblr.com. Please
@@ -2421,7 +2421,7 @@ SOCIAL_MEDIA_FOOTER_DISPLAY = {
# translate this the way that Reddit advertises in your language.
"title": _("Reddit"),
"icon": "fa-reddit-square",
- "action": _("Subscribe to the {platform_name} subreddit"),
+ "action": _(u"Subscribe to the {platform_name} subreddit"),
},
"vk": {
# Translators: This is the website name of https://vk.com. Please
@@ -2440,7 +2440,7 @@ SOCIAL_MEDIA_FOOTER_DISPLAY = {
# translate this the way that YouTube advertises in your language.
"title": _("Youtube"),
"icon": "fa-youtube-square",
- "action": _("Subscribe to the {platform_name} YouTube channel")
+ "action": _(u"Subscribe to the {platform_name} YouTube channel")
}
}
@@ -3324,11 +3324,11 @@ ENTERPRISE_CUSTOMER_LOGO_IMAGE_SIZE = 512 # Enterprise logo image size limit i
ENTERPRISE_PLATFORM_WELCOME_TEMPLATE = _(u'Welcome to {platform_name}.')
ENTERPRISE_SPECIFIC_BRANDED_WELCOME_TEMPLATE = _(
- 'You have left the {start_bold}{enterprise_name}{end_bold} website and are now on the {platform_name} site. '
- '{enterprise_name} has partnered with {platform_name} to offer you high-quality, always available learning '
- 'programs to help you advance your knowledge and career. '
- '{line_break}Please note that {platform_name} has a different {privacy_policy_link_start}Privacy Policy'
- '{privacy_policy_link_end} from {enterprise_name}.'
+ u'You have left the {start_bold}{enterprise_name}{end_bold} website and are now on the {platform_name} site. '
+ u'{enterprise_name} has partnered with {platform_name} to offer you high-quality, always available learning '
+ u'programs to help you advance your knowledge and career. '
+ u'{line_break}Please note that {platform_name} has a different {privacy_policy_link_start}Privacy Policy'
+ u'{privacy_policy_link_end} from {enterprise_name}.'
)
ENTERPRISE_TAGLINE = ''
ENTERPRISE_EXCLUDED_REGISTRATION_FIELDS = {
diff --git a/lms/envs/devstack.py b/lms/envs/devstack.py
index 662d9a1969..26dd18f936 100644
--- a/lms/envs/devstack.py
+++ b/lms/envs/devstack.py
@@ -230,6 +230,7 @@ CORS_ALLOW_HEADERS = corsheaders_default_headers + (
LOGIN_REDIRECT_WHITELIST = [CMS_BASE]
###################### JWTs ######################
+# pylint: disable=unicode-format-string
JWT_AUTH.update({
'JWT_ISSUER': OAUTH_OIDC_ISSUER,
'JWT_AUDIENCE': 'lms-key',
@@ -255,7 +256,7 @@ JWT_AUTH.update({
'y5ZLcTUomo4rZLjghVpq6KZxfS6I1Vz79ZsMVUWEdXOYePCKKsrQG20ogQEkmTf9FT_SouC6jPcHLXw"}]}'
),
})
-
+# pylint: enable=unicode-format-string
#####################################################################
from openedx.core.djangoapps.plugins import plugin_settings, constants as plugin_constants
plugin_settings.add_plugins(__name__, plugin_constants.ProjectType.LMS, plugin_constants.SettingsType.DEVSTACK)
diff --git a/lms/envs/production.py b/lms/envs/production.py
index 240c57a703..2f9cbfd221 100644
--- a/lms/envs/production.py
+++ b/lms/envs/production.py
@@ -379,7 +379,7 @@ if "TRACKING_IGNORE_URL_PATTERNS" in ENV_TOKENS:
SSL_AUTH_EMAIL_DOMAIN = ENV_TOKENS.get("SSL_AUTH_EMAIL_DOMAIN", "MIT.EDU")
SSL_AUTH_DN_FORMAT_STRING = ENV_TOKENS.get(
"SSL_AUTH_DN_FORMAT_STRING",
- "/C=US/ST=Massachusetts/O=Massachusetts Institute of Technology/OU=Client CA v1/CN={0}/emailAddress={1}"
+ u"/C=US/ST=Massachusetts/O=Massachusetts Institute of Technology/OU=Client CA v1/CN={0}/emailAddress={1}"
)
# Django CAS external authentication settings
diff --git a/lms/envs/test.py b/lms/envs/test.py
index d5f094f6eb..2d5caf4d29 100644
--- a/lms/envs/test.py
+++ b/lms/envs/test.py
@@ -584,7 +584,7 @@ VIDEO_TRANSCRIPTS_SETTINGS = dict(
)
####################### Authentication Settings ##########################
-
+# pylint: disable=unicode-format-string
JWT_AUTH.update({
'JWT_PUBLIC_SIGNING_JWK_SET': (
'{"keys": [{"kid": "BTZ9HA6K", "e": "AQAB", "kty": "RSA", "n": "o5cn3ljSRi6FaDEKTn0PS-oL9EFyv1pI7dRgffQLD1qf5D6'
@@ -606,7 +606,7 @@ JWT_AUTH.update({
': "RSA"}'
),
})
-
+# pylint: enable=unicode-format-string
####################### Plugin Settings ##########################
from openedx.core.djangoapps.plugins import plugin_settings, constants as plugin_constants
diff --git a/lms/lib/comment_client/models.py b/lms/lib/comment_client/models.py
index cbf5cd257a..35a781bb07 100644
--- a/lms/lib/comment_client/models.py
+++ b/lms/lib/comment_client/models.py
@@ -29,7 +29,7 @@ class Model(object):
return self.attributes[name]
except KeyError:
if self.retrieved or self.id is None:
- raise AttributeError("Field {0} does not exist".format(name))
+ raise AttributeError(u"Field {0} does not exist".format(name))
self.retrieve()
return self.__getattr__(name)
@@ -41,12 +41,12 @@ class Model(object):
def __getitem__(self, key):
if key not in self.accessible_fields:
- raise KeyError("Field {0} does not exist".format(key))
+ raise KeyError(u"Field {0} does not exist".format(key))
return self.attributes.get(key)
def __setitem__(self, key, value):
if key not in self.accessible_fields + self.updatable_fields:
- raise KeyError("Field {0} does not exist".format(key))
+ raise KeyError(u"Field {0} does not exist".format(key))
self.attributes.__setitem__(key, value)
def items(self, *args, **kwargs):
@@ -103,7 +103,7 @@ class Model(object):
self.__setattr__(k, v)
else:
log.warning(
- "Unexpected field {field_name} in model {model_name}".format(
+ u"Unexpected field {field_name} in model {model_name}".format(
field_name=k,
model_name=self.__class__.__name__
)
@@ -172,11 +172,11 @@ class Model(object):
if cls.base_url is None:
raise CommentClientRequestError("Must provide base_url when using default url function")
if action not in cls.DEFAULT_ACTIONS:
- raise ValueError("Invalid action {0}. The supported action must be in {1}".format(action, str(cls.DEFAULT_ACTIONS)))
+ raise ValueError(u"Invalid action {0}. The supported action must be in {1}".format(action, str(cls.DEFAULT_ACTIONS)))
elif action in cls.DEFAULT_ACTIONS_WITH_ID:
try:
return cls.url_with_id(params)
except KeyError:
- raise CommentClientRequestError("Cannot perform action {0} without id".format(action))
+ raise CommentClientRequestError(u"Cannot perform action {0} without id".format(action))
else: # action must be in DEFAULT_ACTIONS_WITHOUT_ID now
return cls.url_without_id()
diff --git a/lms/templates/shoppingcart/receipt.html b/lms/templates/shoppingcart/receipt.html
index c0a0870ebc..a9f0305586 100644
--- a/lms/templates/shoppingcart/receipt.html
+++ b/lms/templates/shoppingcart/receipt.html
@@ -7,6 +7,7 @@ from django.utils.translation import ungettext
from django.urls import reverse
from markupsafe import escape
from openedx.core.lib.courses import course_image_url
+from openedx.core.djangolib.markup import HTML, Text
%>
<%block name="billing_details_highlight">
@@ -34,29 +35,31 @@ from openedx.core.lib.courses import course_image_url
<% dashboard_url = reverse('dashboard') %>
${_("View Dashboard")}
- ${_(u"You have successfully been enrolled for {course_names}. "
- u"The following receipt has been emailed to {receipient_emails}").format(
- course_names=u"{course_names}".format(
- course_names=escape(appended_course_names)
- ),
- receipient_emails=u"{receipient_emails}".format(
+ ${Text(_(
+ u"You have successfully been enrolled for {course_names}. "
+ u"The following receipt has been emailed to {receipient_emails}"
+ )).format(
+ course_names=HTML(u"{course_names}").format(
+ course_names=appended_course_names
+ ),
+ receipient_emails=HTML(u"{receipient_emails}").format(
receipient_emails=appended_recipient_emails
- ),
+ ),
)}
% elif order_type == 'business':
- ${ungettext(
- "You have successfully purchased {number} course registration code for {course_names}.",
- "You have successfully purchased {number} course registration codes for {course_names}.",
+ ${HTML(ungettext(
+ u"You have successfully purchased {number} course registration code for {course_names}.",
+ u"You have successfully purchased {number} course registration codes for {course_names}.",
total_registration_codes
- ).format(
+ )).format(
number=total_registration_codes,
- course_names=u"{course_names}".format(
+ course_names=HTML(u"{course_names}").format(
course_names=escape(appended_course_names)
)
)}
- ${_("The following receipt has been emailed to {receipient_emails}").format(
- receipient_emails=u"{receipient_emails}".format(
+ ${Text(_(u"The following receipt has been emailed to {receipient_emails}")).format(
+ receipient_emails=HTML(u"{receipient_emails}").format(
receipient_emails=appended_recipient_emails,
)
)}
@@ -293,7 +296,7 @@ from openedx.core.lib.courses import course_image_url
@@ -352,7 +355,7 @@ from openedx.core.lib.courses import course_image_url
% if any_refunds:
## Translators: Please keep the "" and "" tags around your translation of the word "this" in your translation.
- ${_("Note: items with strikethough like this have been refunded.")}
+ ${HTML(_("Note: items with strikethough like this have been refunded."))}
% endif
${_("Total")}: ${currency_symbol}${"{0:0.2f}".format(order.total_cost)} ${currency.upper()}