From c557379caba5177a98b4938e046d2be67148065d Mon Sep 17 00:00:00 2001
From: Stu Young <estute@users.noreply.github.com>
Date: Wed, 15 May 2019 14:55:19 -0400
Subject: [PATCH] incr-268 (#20571)

* run python modernize

* run isort
---
 lms/djangoapps/rss_proxy/admin.py                   | 2 ++
 lms/djangoapps/rss_proxy/migrations/0001_initial.py | 1 +
 lms/djangoapps/rss_proxy/models.py                  | 5 ++++-
 lms/djangoapps/rss_proxy/tests/test_models.py       | 5 ++++-
 lms/djangoapps/rss_proxy/tests/test_views.py        | 5 +++--
 lms/djangoapps/rss_proxy/urls.py                    | 2 ++
 lms/djangoapps/rss_proxy/views.py                   | 3 ++-
 7 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/lms/djangoapps/rss_proxy/admin.py b/lms/djangoapps/rss_proxy/admin.py
index b0e7c0586a..c2a9092d5f 100644
--- a/lms/djangoapps/rss_proxy/admin.py
+++ b/lms/djangoapps/rss_proxy/admin.py
@@ -1,6 +1,8 @@
 """
 Admin module for the rss_proxy djangoapp.
 """
+from __future__ import absolute_import
+
 from django.contrib import admin
 
 from rss_proxy.models import WhitelistedRssUrl
diff --git a/lms/djangoapps/rss_proxy/migrations/0001_initial.py b/lms/djangoapps/rss_proxy/migrations/0001_initial.py
index 973b94bd63..2ca263bbdb 100644
--- a/lms/djangoapps/rss_proxy/migrations/0001_initial.py
+++ b/lms/djangoapps/rss_proxy/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
 import django.utils.timezone
 import model_utils.fields
diff --git a/lms/djangoapps/rss_proxy/models.py b/lms/djangoapps/rss_proxy/models.py
index 49afb7030f..796b538e3b 100644
--- a/lms/djangoapps/rss_proxy/models.py
+++ b/lms/djangoapps/rss_proxy/models.py
@@ -1,6 +1,9 @@
 """
 Models for the rss_proxy djangoapp.
 """
+from __future__ import absolute_import
+
+import six
 from django.db import models
 from model_utils.models import TimeStampedModel
 
@@ -19,4 +22,4 @@ class WhitelistedRssUrl(TimeStampedModel):
         app_label = "rss_proxy"
 
     def __unicode__(self):
-        return unicode(self.url)
+        return six.text_type(self.url)
diff --git a/lms/djangoapps/rss_proxy/tests/test_models.py b/lms/djangoapps/rss_proxy/tests/test_models.py
index 77bb599e55..af9af26680 100644
--- a/lms/djangoapps/rss_proxy/tests/test_models.py
+++ b/lms/djangoapps/rss_proxy/tests/test_models.py
@@ -1,6 +1,9 @@
 """
 Tests for the rss_proxy models
 """
+from __future__ import absolute_import
+
+import six
 from django.test import TestCase
 
 from rss_proxy.models import WhitelistedRssUrl
@@ -17,4 +20,4 @@ class WhitelistedRssUrlTests(TestCase):
         """
         Test the unicode function returns the url
         """
-        self.assertEqual(unicode(self.whitelisted_rss_url), self.whitelisted_rss_url.url)
+        self.assertEqual(six.text_type(self.whitelisted_rss_url), self.whitelisted_rss_url.url)
diff --git a/lms/djangoapps/rss_proxy/tests/test_views.py b/lms/djangoapps/rss_proxy/tests/test_views.py
index 0fbdb93f15..9f07c30e2c 100644
--- a/lms/djangoapps/rss_proxy/tests/test_views.py
+++ b/lms/djangoapps/rss_proxy/tests/test_views.py
@@ -1,9 +1,10 @@
 """
 Tests for the rss_proxy views
 """
-from __future__ import print_function
-from django.urls import reverse
+from __future__ import absolute_import, print_function
+
 from django.test import TestCase
+from django.urls import reverse
 from mock import Mock, patch
 
 from rss_proxy.models import WhitelistedRssUrl
diff --git a/lms/djangoapps/rss_proxy/urls.py b/lms/djangoapps/rss_proxy/urls.py
index ac7b7a5265..16db5edbed 100644
--- a/lms/djangoapps/rss_proxy/urls.py
+++ b/lms/djangoapps/rss_proxy/urls.py
@@ -1,6 +1,8 @@
 """
 URLs for the rss_proxy djangoapp.
 """
+from __future__ import absolute_import
+
 from django.conf.urls import url
 
 from rss_proxy.views import proxy
diff --git a/lms/djangoapps/rss_proxy/views.py b/lms/djangoapps/rss_proxy/views.py
index 1028cfcb83..c09919fe71 100644
--- a/lms/djangoapps/rss_proxy/views.py
+++ b/lms/djangoapps/rss_proxy/views.py
@@ -1,7 +1,8 @@
 """
 Views for the rss_proxy djangoapp.
 """
-from __future__ import print_function
+from __future__ import absolute_import, print_function
+
 import requests
 from django.conf import settings
 from django.core.cache import cache