From 1e01baf979cbbf90dbc27c3e6ed99a92745b3a5f Mon Sep 17 00:00:00 2001
From: Stu Young <estute@users.noreply.github.com>
Date: Tue, 21 May 2019 11:38:26 -0400
Subject: [PATCH] INCR-255 Run python-modernize on lms/djangoapps/notes
 (#20565)

* run python modernize

* run isort

* Fix quality
---
 lms/djangoapps/notes/api.py                     | 3 ++-
 lms/djangoapps/notes/migrations/0001_initial.py | 1 +
 lms/djangoapps/notes/models.py                  | 7 ++++++-
 lms/djangoapps/notes/tests.py                   | 8 ++++++--
 lms/djangoapps/notes/urls.py                    | 2 ++
 lms/djangoapps/notes/utils.py                   | 5 +++++
 lms/djangoapps/notes/views.py                   | 2 ++
 7 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/lms/djangoapps/notes/api.py b/lms/djangoapps/notes/api.py
index ed736d5501..602202cb8c 100644
--- a/lms/djangoapps/notes/api.py
+++ b/lms/djangoapps/notes/api.py
@@ -1,8 +1,10 @@
 from __future__ import absolute_import
+
 import collections
 import json
 import logging
 
+import six
 from django.contrib.auth.decorators import login_required
 from django.core.exceptions import ValidationError
 from django.http import Http404, HttpResponse
@@ -11,7 +13,6 @@ from opaque_keys.edx.keys import CourseKey
 from courseware.courses import get_course_with_access
 from notes.models import Note
 from notes.utils import notes_enabled_for_course
-import six
 
 log = logging.getLogger(__name__)
 
diff --git a/lms/djangoapps/notes/migrations/0001_initial.py b/lms/djangoapps/notes/migrations/0001_initial.py
index 0fd2629616..af73316723 100644
--- a/lms/djangoapps/notes/migrations/0001_initial.py
+++ b/lms/djangoapps/notes/migrations/0001_initial.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
+from __future__ import absolute_import
 from django.db import migrations, models
 from django.conf import settings
 from opaque_keys.edx.django.models import CourseKeyField
diff --git a/lms/djangoapps/notes/models.py b/lms/djangoapps/notes/models.py
index f70dffffa2..f22856d3da 100644
--- a/lms/djangoapps/notes/models.py
+++ b/lms/djangoapps/notes/models.py
@@ -1,9 +1,14 @@
+"""
+Notes models
+"""
+from __future__ import absolute_import
+
 import json
 
 from django.contrib.auth.models import User
 from django.core.exceptions import ValidationError
-from django.urls import reverse
 from django.db import models
+from django.urls import reverse
 from django.utils.html import strip_tags
 from opaque_keys.edx.django.models import CourseKeyField
 from six import text_type
diff --git a/lms/djangoapps/notes/tests.py b/lms/djangoapps/notes/tests.py
index 2ee2e263b3..269a6ced62 100644
--- a/lms/djangoapps/notes/tests.py
+++ b/lms/djangoapps/notes/tests.py
@@ -2,16 +2,20 @@
 Unit tests for the notes app.
 """
 
+from __future__ import absolute_import
+
 import json
 
+import six
 from django.contrib.auth.models import User
 from django.core.exceptions import ValidationError
-from django.urls import reverse
 from django.test import RequestFactory, TestCase
 from django.test.client import Client
+from django.urls import reverse
 from mock import Mock, patch
 from opaque_keys.edx.locator import CourseLocator
 from six import text_type
+from six.moves import range
 
 from courseware.tabs import CourseTab, get_course_tab_list
 from notes import api, models, utils
@@ -443,6 +447,6 @@ class NoteTest(TestCase):
     def test_as_dict(self):
         note = models.Note(course_id=self.course_key, user=self.student)
         d = note.as_dict()
-        self.assertNotIsInstance(d, basestring)
+        self.assertNotIsInstance(d, six.string_types)
         self.assertEqual(d['user_id'], self.student.id)
         self.assertNotIn('course_id', d)
diff --git a/lms/djangoapps/notes/urls.py b/lms/djangoapps/notes/urls.py
index 293c69155b..4e4623a229 100644
--- a/lms/djangoapps/notes/urls.py
+++ b/lms/djangoapps/notes/urls.py
@@ -2,6 +2,8 @@
 URL definitions for the notes app
 """
 
+from __future__ import absolute_import
+
 from django.conf.urls import url
 
 from notes.api import api_request
diff --git a/lms/djangoapps/notes/utils.py b/lms/djangoapps/notes/utils.py
index b0add40ff5..6ce8344725 100644
--- a/lms/djangoapps/notes/utils.py
+++ b/lms/djangoapps/notes/utils.py
@@ -1,3 +1,8 @@
+"""
+Notes utilities
+"""
+from __future__ import absolute_import
+
 from django.conf import settings
 
 
diff --git a/lms/djangoapps/notes/views.py b/lms/djangoapps/notes/views.py
index 339d38c00e..14d5d0033b 100644
--- a/lms/djangoapps/notes/views.py
+++ b/lms/djangoapps/notes/views.py
@@ -2,6 +2,8 @@
 Views to support the edX Notes feature.
 """
 
+from __future__ import absolute_import
+
 from django.conf import settings
 from django.contrib.auth.decorators import login_required
 from django.http import Http404