From 489c78dfa72af4e62d7881014057bd9457152c5b Mon Sep 17 00:00:00 2001
From: Anthony Wee <antxwee@gmail.com>
Date: Mon, 13 May 2019 10:00:01 -0700
Subject: [PATCH]  INCR-132: Run python-modernize on common/djangoapps/status
 (#20450)

* INCR-132: Run python-modernize on common/djangoapps/status

* isort

* isort migrations
---
 common/djangoapps/status/migrations/0001_initial.py        | 3 +--
 .../djangoapps/status/migrations/0002_update_help_text.py  | 2 +-
 common/djangoapps/status/models.py                         | 7 +++++--
 common/djangoapps/status/status.py                         | 2 ++
 common/djangoapps/status/tests.py                          | 2 ++
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/common/djangoapps/status/migrations/0001_initial.py b/common/djangoapps/status/migrations/0001_initial.py
index 94d4c77b7a..4c98321a04 100644
--- a/common/djangoapps/status/migrations/0001_initial.py
+++ b/common/djangoapps/status/migrations/0001_initial.py
@@ -1,10 +1,9 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
 
 import django.db.models.deletion
 from django.conf import settings
 from django.db import migrations, models
-
 from opaque_keys.edx.django.models import CourseKeyField
 
 
diff --git a/common/djangoapps/status/migrations/0002_update_help_text.py b/common/djangoapps/status/migrations/0002_update_help_text.py
index bebdacafe3..3f5df18189 100644
--- a/common/djangoapps/status/migrations/0002_update_help_text.py
+++ b/common/djangoapps/status/migrations/0002_update_help_text.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
 
diff --git a/common/djangoapps/status/models.py b/common/djangoapps/status/models.py
index 9579439968..fdd1ee7491 100644
--- a/common/djangoapps/status/models.py
+++ b/common/djangoapps/status/models.py
@@ -2,6 +2,9 @@
 Store status messages in the database.
 """
 
+from __future__ import absolute_import
+
+import six
 from config_models.admin import ConfigurationModelAdmin
 from config_models.models import ConfigurationModel
 from django.contrib import admin
@@ -31,7 +34,7 @@ class GlobalStatusMessage(ConfigurationModel):
 
     def full_message(self, course_key):
         """ Returns the full status message, including any course-specific status messages. """
-        cache_key = "status_message.{course_id}".format(course_id=unicode(course_key))
+        cache_key = "status_message.{course_id}".format(course_id=six.text_type(course_key))
         if cache.get(cache_key):
             return cache.get(cache_key)
 
@@ -66,7 +69,7 @@ class CourseMessage(models.Model):
     message = models.TextField(blank=True, null=True)
 
     def __unicode__(self):
-        return unicode(self.course_key)
+        return six.text_type(self.course_key)
 
 
 admin.site.register(GlobalStatusMessage, ConfigurationModelAdmin)
diff --git a/common/djangoapps/status/status.py b/common/djangoapps/status/status.py
index 7ff1390b54..333be9e85d 100644
--- a/common/djangoapps/status/status.py
+++ b/common/djangoapps/status/status.py
@@ -2,6 +2,8 @@
 A tiny app that checks for a status message.
 """
 
+from __future__ import absolute_import
+
 import logging
 
 from .models import GlobalStatusMessage
diff --git a/common/djangoapps/status/tests.py b/common/djangoapps/status/tests.py
index 30dffde1d9..0d3451f76c 100644
--- a/common/djangoapps/status/tests.py
+++ b/common/djangoapps/status/tests.py
@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 """ Tests for setting and displaying the site status message. """
+from __future__ import absolute_import
+
 import unittest
 
 import ddt