From 65f4a63ecf8bcc857d5baa4bd02297456e7791fd Mon Sep 17 00:00:00 2001
From: Amit <43564590+amitvadhel@users.noreply.github.com>
Date: Mon, 13 May 2019 19:35:39 +0300
Subject: [PATCH] =?UTF-8?q?INCR-248:=20Make=20compatible=20with=20Python?=
 =?UTF-8?q?=203.x=20without=20breaking=20Python=202.7=E2=80=A6=20(#20529)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* INCR-248: Make compatible with Python 3.x without breaking Python 2.7 support --> common/djangoapps/xblock_django

* INCR-248: Grouped absolute_import and unicode_literals imports

* INCR-248: Grouped absolute_import and unicode_literals imports for migrations
---
 common/djangoapps/xblock_django/admin.py        | 2 ++
 common/djangoapps/xblock_django/api.py          | 2 ++
 common/djangoapps/xblock_django/models.py       | 2 ++
 common/djangoapps/xblock_django/user_service.py | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/common/djangoapps/xblock_django/admin.py b/common/djangoapps/xblock_django/admin.py
index ec7246181d..22cabe1bf4 100644
--- a/common/djangoapps/xblock_django/admin.py
+++ b/common/djangoapps/xblock_django/admin.py
@@ -2,6 +2,8 @@
 Django admin dashboard configuration.
 """
 
+from __future__ import absolute_import
+
 from config_models.admin import ConfigurationModelAdmin, KeyedConfigurationModelAdmin
 from django.contrib import admin
 from django.utils.translation import ugettext_lazy as _
diff --git a/common/djangoapps/xblock_django/api.py b/common/djangoapps/xblock_django/api.py
index a316740c94..3a8d4c0814 100644
--- a/common/djangoapps/xblock_django/api.py
+++ b/common/djangoapps/xblock_django/api.py
@@ -2,6 +2,8 @@
 API methods related to xblock state.
 """
 
+from __future__ import absolute_import
+
 from xblock_django.models import XBlockConfiguration, XBlockStudioConfiguration
 
 
diff --git a/common/djangoapps/xblock_django/models.py b/common/djangoapps/xblock_django/models.py
index ffd0082238..48d8b5b8d6 100644
--- a/common/djangoapps/xblock_django/models.py
+++ b/common/djangoapps/xblock_django/models.py
@@ -2,6 +2,8 @@
 Models.
 """
 
+from __future__ import absolute_import
+
 from config_models.models import ConfigurationModel
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
diff --git a/common/djangoapps/xblock_django/user_service.py b/common/djangoapps/xblock_django/user_service.py
index d8ef8acd21..9ce52ca5c1 100644
--- a/common/djangoapps/xblock_django/user_service.py
+++ b/common/djangoapps/xblock_django/user_service.py
@@ -1,6 +1,8 @@
 """
 Support for converting a django user to an XBlock user
 """
+from __future__ import absolute_import
+
 from django.contrib.auth.models import User
 from opaque_keys.edx.keys import CourseKey
 from xblock.reference.user_service import UserService, XBlockUser