Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INCR-452: Updates on Python 3.x (#21058)

Browse Source
This commit is contained in:
Amit
2019-07-11 17:19:53 +03:00
committed by Feanil Patel
parent 51ca3d5e10
commit 9ecb771aa8
8 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lms/djangoapps/badges/api/tests.py
View File

@@ -1,9 +1,13 @@
"""
Tests for the badges API views.
"""
from __future__ import absolute_import
import six
from ddt import data, ddt, unpack
from django.conf import settings
from django.test.utils import override_settings
from six.moves import range
from badges.tests.factories import BadgeAssertionFactory, BadgeClassFactory, RandomBadgeClassFactory
from openedx.core.lib.api.test_utils import ApiTestCase
@@ -44,7 +48,7 @@ class UserAssertionTestCase(UrlResetMixin, ModuleStoreTestCase, ApiTestCase):
self.assertIn(badge_class.image.url, json_class['image_url'])
self.assertEqual(badge_class.description, json_class['description'])
self.assertEqual(badge_class.criteria, json_class['criteria'])
self.assertEqual(badge_class.course_id and unicode(badge_class.course_id), json_class['course_id'])
self.assertEqual(badge_class.course_id and six.text_type(badge_class.course_id), json_class['course_id'])
def check_assertion_structure(self, assertion, json_assertion):
"""
@@ -61,7 +65,7 @@ class UserAssertionTestCase(UrlResetMixin, ModuleStoreTestCase, ApiTestCase):
if wildcard:
return '*'
else:
return unicode(badge_class.course_id)
return six.text_type(badge_class.course_id)
def create_badge_class(self, check_course, **kwargs):
"""