INCR-125: Run python-modernize on common/djangoapps/track/views and migrations (#20425)

* INCR-125: Run python-modernize on common/djangoapps/track/views and migrations

* isort

common/djangoapps/track/migrations/0001_initial.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
 

common/djangoapps/track/views/__init__.py

@@ -1,23 +1,21 @@
+from __future__ import absolute_import
+
 import datetime
 import json
 
 import pytz
-
+import six
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.models import User
 from django.http import HttpResponse
 from django.shortcuts import redirect
-
 from django.views.decorators.csrf import ensure_csrf_cookie
-
-from edxmako.shortcuts import render_to_response
+from eventtracking import tracker as eventtracker
 from ipware.ip import get_ip
 
-from track import tracker
-from track import contexts
-from track import shim
+from edxmako.shortcuts import render_to_response
+from track import contexts, shim, tracker
 from track.models import TrackingLog
-from eventtracking import tracker as eventtracker
 
 
 def log_event(event):
@@ -82,7 +80,7 @@ def user_track(request):
     data = _get_request_value(request, 'event', {})
     page = _get_request_value(request, 'page')
 
-    if isinstance(data, basestring) and len(data) > 0:
+    if isinstance(data, six.string_types) and len(data) > 0:
         try:
             data = json.loads(data)
             _add_user_id_for_username(data)

common/djangoapps/track/views/segmentio.py

@@ -1,5 +1,7 @@
 """Handle events that were forwarded from the Segment webhook integration"""
 
+from __future__ import absolute_import
+
 import json
 import logging
 
@@ -9,10 +11,10 @@ from django.contrib.auth.models import User
 from django.http import HttpResponse
 from django.views.decorators.csrf import csrf_exempt
 from django.views.decorators.http import require_POST
+from eventtracking import tracker
 from opaque_keys import InvalidKeyError
 from opaque_keys.edx.keys import CourseKey
 
-from eventtracking import tracker
 from util.json_request import expect_json
 
 log = logging.getLogger(__name__)

common/djangoapps/track/views/tests/base.py

@@ -2,15 +2,16 @@
 Base class for tests related to emitted events to one of the tracking 'views'
 (e.g. SegmentIO).
 """
+from __future__ import absolute_import
+
 import json
-from mock import sentinel
 
 from django.test.client import RequestFactory
 from django.test.utils import override_settings
+from mock import sentinel
 
-from track.views import segmentio
 from track.tests import EventTrackingTestCase
-
+from track.views import segmentio
 
 SEGMENTIO_TEST_SECRET = 'anything'
 SEGMENTIO_TEST_ENDPOINT = '/segmentio/test/event'

common/djangoapps/track/views/tests/test_segmentio.py

@@ -1,21 +1,18 @@
 """Ensure we can parse events sent to us from the Segment webhook integration"""
+from __future__ import absolute_import
+
 import json
 
 from dateutil import parser
-from ddt import ddt, data, unpack
-from mock import sentinel
-
+from ddt import data, ddt, unpack
 from django.contrib.auth.models import User
 from django.test.utils import override_settings
+from mock import sentinel
 
 from openedx.core.lib.tests.assertions.events import assert_event_matches
 from track.middleware import TrackMiddleware
 from track.views import segmentio
-from track.views.tests.base import (
-    SegmentIOTrackingTestCaseBase,
-    SEGMENTIO_TEST_ENDPOINT,
-    SEGMENTIO_TEST_USER_ID
-)
+from track.views.tests.base import SEGMENTIO_TEST_ENDPOINT, SEGMENTIO_TEST_USER_ID, SegmentIOTrackingTestCaseBase
 
 
 def expect_failure_with_message(message):

common/djangoapps/track/views/tests/test_views.py

@@ -1,17 +1,17 @@
 # pylint: disable=missing-docstring,maybe-no-member
 
-import ddt
-from mock import patch, sentinel
+from __future__ import absolute_import
 
+import ddt
 from django.contrib.auth.models import User
 from django.test.client import RequestFactory
 from django.test.utils import override_settings
+from mock import patch, sentinel
 
+from openedx.core.lib.tests.assertions.events import assert_event_matches
 from track import views
 from track.middleware import TrackMiddleware
-from track.tests import EventTrackingTestCase, FROZEN_TIME
-from openedx.core.lib.tests.assertions.events import assert_event_matches
-
+from track.tests import FROZEN_TIME, EventTrackingTestCase
 
 TEST_USERNAME = 'test-username'
 TEST_USER_ID = 1000