From f7cb9641dd255bf6e08655511800d6b5be45bf58 Mon Sep 17 00:00:00 2001
From: Jolyon Bloomfield <jkb84@cornell.edu>
Date: Fri, 29 Mar 2019 12:40:14 -0700
Subject: [PATCH] Migrating common/djangoapps/course_action_state

---
 common/djangoapps/course_action_state/managers.py            | 5 +++--
 .../course_action_state/migrations/0001_initial.py           | 3 +--
 common/djangoapps/course_action_state/models.py              | 2 +-
 common/djangoapps/course_action_state/tests/test_managers.py | 3 +++
 .../course_action_state/tests/test_rerun_manager.py          | 2 ++
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/common/djangoapps/course_action_state/managers.py b/common/djangoapps/course_action_state/managers.py
index d6b9729f5b..3743895f56 100644
--- a/common/djangoapps/course_action_state/managers.py
+++ b/common/djangoapps/course_action_state/managers.py
@@ -1,8 +1,9 @@
 """
 Model Managers for Course Actions
 """
+from __future__ import absolute_import
+import six
 import traceback
-
 from django.db import models, transaction
 
 
@@ -88,7 +89,7 @@ class CourseActionUIStateManager(CourseActionStateManager):
 
         # update any additional fields in kwargs
         if kwargs:
-            for key, value in kwargs.iteritems():
+            for key, value in six.iteritems(kwargs):
                 setattr(state_object, key, value)
 
         state_object.save()
diff --git a/common/djangoapps/course_action_state/migrations/0001_initial.py b/common/djangoapps/course_action_state/migrations/0001_initial.py
index 6d514757fc..ed18f83d47 100644
--- a/common/djangoapps/course_action_state/migrations/0001_initial.py
+++ b/common/djangoapps/course_action_state/migrations/0001_initial.py
@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
+from __future__ import unicode_literals, absolute_import
 import django.db.models.deletion
 from django.conf import settings
 from django.db import migrations, models
diff --git a/common/djangoapps/course_action_state/models.py b/common/djangoapps/course_action_state/models.py
index 02166cd730..aca7c48626 100644
--- a/common/djangoapps/course_action_state/models.py
+++ b/common/djangoapps/course_action_state/models.py
@@ -9,10 +9,10 @@ file and check it in at the same time as your model changes. To do that,
 3. It adds the migration file to edx-platform/common/djangoapps/course_action_state/migrations/
 
 """
+from __future__ import absolute_import
 from django.contrib.auth.models import User
 from django.db import models
 from opaque_keys.edx.django.models import CourseKeyField
-
 from course_action_state.managers import CourseActionStateManager, CourseRerunUIStateManager
 
 
diff --git a/common/djangoapps/course_action_state/tests/test_managers.py b/common/djangoapps/course_action_state/tests/test_managers.py
index 523c3fbede..f0664edebe 100644
--- a/common/djangoapps/course_action_state/tests/test_managers.py
+++ b/common/djangoapps/course_action_state/tests/test_managers.py
@@ -2,6 +2,9 @@
 """
 Tests for basic common operations related to Course Action State managers
 """
+from __future__ import absolute_import
+from six.moves import range
+
 from collections import namedtuple
 
 from ddt import data, ddt
diff --git a/common/djangoapps/course_action_state/tests/test_rerun_manager.py b/common/djangoapps/course_action_state/tests/test_rerun_manager.py
index d5b4a22c5c..519a9ac1e2 100644
--- a/common/djangoapps/course_action_state/tests/test_rerun_manager.py
+++ b/common/djangoapps/course_action_state/tests/test_rerun_manager.py
@@ -2,6 +2,8 @@
 Tests specific to the CourseRerunState Model and Manager.
 """
 
+from __future__ import absolute_import
+
 from django.test import TestCase
 from opaque_keys.edx.locations import CourseLocator
 from six import text_type