INCR-138

openedx/core/djangoapps/api_admin/management/commands/delete_historical_api_admin_data.py

@@ -2,6 +2,7 @@
 Command to delete all rows from the api_admin_historicalapiaccessrequest table.
 """
 
+from __future__ import absolute_import
 import logging
 from openedx.core.djangoapps.api_admin.models import ApiAccessRequest
 from openedx.core.djangoapps.util.row_delete import delete_rows, BaseDeletionCommand

openedx/core/djangoapps/api_admin/migrations/0001_initial.py

@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
 
-from django.db import migrations, models
 import django.db.models.deletion
-from django.conf import settings
 import django.utils.timezone
 import model_utils.fields
+from django.conf import settings
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

openedx/core/djangoapps/api_admin/migrations/0002_auto_20160325_1604.py

@@ -1,9 +1,8 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
 
 from django.db import migrations, models
 
-
 API_GROUP_NAME = 'API Access Request Approvers'
 
 

openedx/core/djangoapps/api_admin/migrations/0003_auto_20160404_1618.py

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
 
-from django.db import migrations, models
 import django.db.models.deletion
 from django.conf import settings
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

openedx/core/djangoapps/api_admin/migrations/0004_auto_20160412_1506.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

openedx/core/djangoapps/api_admin/migrations/0005_auto_20160414_1232.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
 
-from django.db import migrations, models
 from django.conf import settings
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

openedx/core/djangoapps/api_admin/migrations/0006_catalog.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
 
 from django.db import migrations, models
 

openedx/core/djangoapps/api_admin/migrations/0007_delete_historical_api_records.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
 
 from django.db import migrations, models
 

openedx/core/djangoapps/api_admin/tests/factories.py

@@ -1,14 +1,15 @@
 """Factories for API management."""
+from __future__ import absolute_import
+
 import factory
-from factory.fuzzy import FuzzyInteger, FuzzyText
 from factory.django import DjangoModelFactory
+from factory.fuzzy import FuzzyInteger, FuzzyText
 from oauth2_provider.models import get_application_model
 
 from microsite_configuration.tests.factories import SiteFactory
 from openedx.core.djangoapps.api_admin.models import ApiAccessRequest, Catalog
 from student.tests.factories import UserFactory
 
-
 Application = get_application_model()  # pylint: disable=invalid-name
 
 

openedx/core/djangoapps/api_admin/tests/test_forms.py

@@ -1,5 +1,7 @@
 #pylint: disable=missing-docstring
 
+from __future__ import absolute_import
+
 import ddt
 from django.test import TestCase
 

openedx/core/djangoapps/api_admin/tests/test_models.py

@@ -1,13 +1,16 @@
 # pylint: disable=missing-docstring
+from __future__ import absolute_import
+
 from smtplib import SMTPException
 
 import ddt
+import mock
+import six
 from django.db import IntegrityError
 from django.test import TestCase
-import mock
 
 from microsite_configuration.tests.factories import SiteFactory
-from openedx.core.djangoapps.api_admin.models import ApiAccessRequest, ApiAccessConfig
+from openedx.core.djangoapps.api_admin.models import ApiAccessConfig, ApiAccessRequest
 from openedx.core.djangoapps.api_admin.models import log as model_log
 from openedx.core.djangoapps.api_admin.tests.factories import ApiAccessRequestFactory
 from openedx.core.djangolib.testing.utils import skip_unless_lms
@@ -60,7 +63,7 @@ class ApiAccessRequestTests(TestCase):
         self.assertIsNone(ApiAccessRequest.api_access_status(self.user))
 
     def test_unicode(self):
-        request_unicode = unicode(self.request)
+        request_unicode = six.text_type(self.request)
         self.assertIn(self.request.website, request_unicode)
         self.assertIn(self.request.status, request_unicode)
 
@@ -82,11 +85,11 @@ class ApiAccessConfigTests(TestCase):
 
     def test_unicode(self):
         self.assertEqual(
-            unicode(ApiAccessConfig(enabled=True)),
+            six.text_type(ApiAccessConfig(enabled=True)),
             u'ApiAccessConfig [enabled=True]'
         )
         self.assertEqual(
-            unicode(ApiAccessConfig(enabled=False)),
+            six.text_type(ApiAccessConfig(enabled=False)),
             u'ApiAccessConfig [enabled=False]'
         )
 

openedx/core/djangoapps/api_admin/tests/test_views.py

@@ -1,13 +1,15 @@
 """ Tests for the api_admin app's views. """
 
+from __future__ import absolute_import
+
 import json
 
 import ddt
 import httpretty
 from django.conf import settings
-from django.urls import reverse
 from django.test import TestCase
 from django.test.utils import override_settings
+from django.urls import reverse
 from oauth2_provider.models import get_application_model
 
 from openedx.core.djangoapps.api_admin.models import ApiAccessConfig, ApiAccessRequest