From 07b75ae69028159756d555869f6d96810d41d6b4 Mon Sep 17 00:00:00 2001
From: Amit <43564590+amitvadhel@users.noreply.github.com>
Date: Fri, 10 May 2019 15:37:27 +0300
Subject: [PATCH] INCR-164: Run python-modernize on
 common/djangoapps/microsite_configuration [backends, management, migrations]
 (#20507)

---
 .../microsite_configuration/backends/base.py          | 11 +++++------
 .../microsite_configuration/backends/database.py      |  2 ++
 .../microsite_configuration/backends/filebased.py     |  1 +
 .../commands/delete_historical_microsite_data.py      |  1 +
 .../migrations/0001_initial.py                        |  2 +-
 .../migrations/0002_auto_20160202_0228.py             |  2 +-
 .../migrations/0003_delete_historical_records.py      |  2 +-
 7 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/common/djangoapps/microsite_configuration/backends/base.py b/common/djangoapps/microsite_configuration/backends/base.py
index a31e91bc57..d4c4b7ec55 100644
--- a/common/djangoapps/microsite_configuration/backends/base.py
+++ b/common/djangoapps/microsite_configuration/backends/base.py
@@ -7,11 +7,11 @@ AbstractBaseMicrositeBackend is Abstract Base Class for the microsite configurat
 BaseMicrositeBackend is Base Class for microsite configuration backend.
 BaseMicrositeTemplateBackend is Base Class for the microsite template backend.
 """
-
 from __future__ import absolute_import
 
 import abc
 import os.path
+import six
 import threading
 
 from django.conf import settings
@@ -20,11 +20,10 @@ from util.url import strip_port_from_host
 
 
 # pylint: disable=unused-argument
-class AbstractBaseMicrositeBackend(object):
+class AbstractBaseMicrositeBackend(six.with_metaclass(abc.ABCMeta, object)):
     """
     Abstract Base Class for the microsite backends.
     """
-    __metaclass__ = abc.ABCMeta
 
     def __init__(self, **kwargs):
         pass
@@ -207,7 +206,7 @@ class BaseMicrositeBackend(AbstractBaseMicrositeBackend):
         """
         config = {}
 
-        for key, value in settings.MICROSITE_CONFIGURATION.iteritems():
+        for key, value in six.iteritems(settings.MICROSITE_CONFIGURATION):
             config[key] = value
 
         return config
@@ -222,7 +221,7 @@ class BaseMicrositeBackend(AbstractBaseMicrositeBackend):
             return default
 
         # Filter at the setting file
-        for value in settings.MICROSITE_CONFIGURATION.itervalues():
+        for value in six.itervalues(settings.MICROSITE_CONFIGURATION):
             org_filter = value.get('course_org_filter', None)
             if org_filter == org:
                 return value.get(val_name, default)
@@ -239,7 +238,7 @@ class BaseMicrositeBackend(AbstractBaseMicrositeBackend):
             return org_filter_set
 
         # Get the orgs in the db
-        for microsite in settings.MICROSITE_CONFIGURATION.itervalues():
+        for microsite in six.itervalues(settings.MICROSITE_CONFIGURATION):
             org_filter = microsite.get('course_org_filter')
             if org_filter:
                 org_filter_set.add(org_filter)
diff --git a/common/djangoapps/microsite_configuration/backends/database.py b/common/djangoapps/microsite_configuration/backends/database.py
index ccd5126e20..80f379a0b3 100644
--- a/common/djangoapps/microsite_configuration/backends/database.py
+++ b/common/djangoapps/microsite_configuration/backends/database.py
@@ -1,6 +1,8 @@
 """
 Microsite backend that reads the configuration from the database
 """
+from __future__ import absolute_import
+
 from django.conf import settings
 from django.db.models.signals import post_save
 from django.dispatch import receiver
diff --git a/common/djangoapps/microsite_configuration/backends/filebased.py b/common/djangoapps/microsite_configuration/backends/filebased.py
index e14eba9f14..f179d35129 100644
--- a/common/djangoapps/microsite_configuration/backends/filebased.py
+++ b/common/djangoapps/microsite_configuration/backends/filebased.py
@@ -2,6 +2,7 @@
 Microsite backend that reads the configuration from a file
 
 """
+from __future__ import absolute_import
 
 from microsite_configuration.backends.base import BaseMicrositeBackend, BaseMicrositeTemplateBackend
 
diff --git a/common/djangoapps/microsite_configuration/management/commands/delete_historical_microsite_data.py b/common/djangoapps/microsite_configuration/management/commands/delete_historical_microsite_data.py
index 9e3a8f8d47..8364daae27 100644
--- a/common/djangoapps/microsite_configuration/management/commands/delete_historical_microsite_data.py
+++ b/common/djangoapps/microsite_configuration/management/commands/delete_historical_microsite_data.py
@@ -3,6 +3,7 @@ Command to delete all rows from these tables:
 microsite_configuration_historicalmicrositeorganizationmapping
 microsite_configuration_historicalmicrositetemplate
 """
+from __future__ import absolute_import
 
 import logging
 from microsite_configuration.models import MicrositeOrganizationMapping, MicrositeTemplate
diff --git a/common/djangoapps/microsite_configuration/migrations/0001_initial.py b/common/djangoapps/microsite_configuration/migrations/0001_initial.py
index 2a12da189e..f1cf7b94c3 100644
--- a/common/djangoapps/microsite_configuration/migrations/0001_initial.py
+++ b/common/djangoapps/microsite_configuration/migrations/0001_initial.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
 
 import django.db.models.deletion
 import django.utils.timezone
diff --git a/common/djangoapps/microsite_configuration/migrations/0002_auto_20160202_0228.py b/common/djangoapps/microsite_configuration/migrations/0002_auto_20160202_0228.py
index e85078e583..bd56d24f24 100644
--- a/common/djangoapps/microsite_configuration/migrations/0002_auto_20160202_0228.py
+++ b/common/djangoapps/microsite_configuration/migrations/0002_auto_20160202_0228.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/microsite_configuration/migrations/0003_delete_historical_records.py b/common/djangoapps/microsite_configuration/migrations/0003_delete_historical_records.py
index ad54faa8b5..a3addef725 100644
--- a/common/djangoapps/microsite_configuration/migrations/0003_delete_historical_records.py
+++ b/common/djangoapps/microsite_configuration/migrations/0003_delete_historical_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