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

lms/djangoapps/badges/admin.py

@@ -1,6 +1,8 @@
 """
 Admin registration for Badge Models
 """
+from __future__ import absolute_import
+
 from config_models.admin import ConfigurationModelAdmin
 from django.contrib import admin
 

lms/djangoapps/badges/api/serializers.py

@@ -1,6 +1,8 @@
 """
 Serializers for Badges
 """
+from __future__ import absolute_import
+
 from rest_framework import serializers
 
 from badges.models import BadgeAssertion, BadgeClass

lms/djangoapps/badges/api/tests.py

@@ -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):
         """

lms/djangoapps/badges/api/views.py

@@ -1,6 +1,8 @@
 """
 API views for badges
 """
+from __future__ import absolute_import
+
 from edx_rest_framework_extensions.auth.session.authentication import SessionAuthenticationAllowInactiveUser
 from opaque_keys import InvalidKeyError
 from opaque_keys.edx.django.models import CourseKeyField

lms/djangoapps/badges/apps.py

@@ -4,6 +4,8 @@ Badges Application Configuration
 Signal handlers are connected here.
 """
 
+from __future__ import absolute_import
+
 from django.apps import AppConfig
 
 

lms/djangoapps/badges/models.py

@@ -1,8 +1,11 @@
 """
 Database models for the badges app
 """
+from __future__ import absolute_import
+
 from importlib import import_module
 
+import six
 from config_models.models import ConfigurationModel
 from django.conf import settings
 from django.contrib.auth.models import User
@@ -310,12 +313,12 @@ class CourseEventBadgesConfiguration(ConfigurationModel):
             try:
                 self.completed_settings
             except (ValueError, InvalidKeyError):
-                errors['courses_completed'] = [unicode(error_message)]
+                errors['courses_completed'] = [six.text_type(error_message)]
         if 'courses_enrolled' not in exclude:
             try:
                 self.enrolled_settings
             except (ValueError, InvalidKeyError):
-                errors['courses_enrolled'] = [unicode(error_message)]
+                errors['courses_enrolled'] = [six.text_type(error_message)]
         if 'course_groups' not in exclude:
             store = modulestore()
             try:
@@ -324,7 +327,7 @@ class CourseEventBadgesConfiguration(ConfigurationModel):
                         if not store.get_course(course_key):
                             ValueError(u"The course {course_key} does not exist.".format(course_key=course_key))
             except (ValueError, InvalidKeyError):
-                errors['course_groups'] = [unicode(error_message)]
+                errors['course_groups'] = [six.text_type(error_message)]
         if errors:
             raise ValidationError(errors)
 

lms/djangoapps/badges/service.py

@@ -1,6 +1,8 @@
 """
 Badging service for XBlocks
 """
+from __future__ import absolute_import
+
 from badges.models import BadgeClass
 
 

lms/djangoapps/badges/utils.py

@@ -1,6 +1,8 @@
 """
 Utility functions used by the badging app.
 """
+from __future__ import absolute_import
+
 from django.conf import settings