INCR-164: Run python-modernize on common/djangoapps/microsite_configuration [backends, management, migrations] (#20507)

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)

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

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
 

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

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

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
 

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