From ea8a197eb4227d8162d17f3d0efc33b11d72f0d1 Mon Sep 17 00:00:00 2001
From: Ayub khan <muhammadayubkhan6@gmail.com>
Date: Fri, 12 Jul 2019 12:41:27 +0500
Subject: [PATCH] INCR-427 python3 compatibility

---
 common/test/acceptance/fixtures/__init__.py     | 6 +++++-
 common/test/acceptance/fixtures/base.py         | 5 ++++-
 common/test/acceptance/fixtures/catalog.py      | 2 ++
 common/test/acceptance/fixtures/certificates.py | 2 ++
 common/test/acceptance/fixtures/course.py       | 7 +++++--
 common/test/acceptance/fixtures/edxnotes.py     | 2 ++
 common/test/acceptance/fixtures/library.py      | 5 ++++-
 7 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/common/test/acceptance/fixtures/__init__.py b/common/test/acceptance/fixtures/__init__.py
index 5f35a0cc67..ef6e33a159 100644
--- a/common/test/acceptance/fixtures/__init__.py
+++ b/common/test/acceptance/fixtures/__init__.py
@@ -1,5 +1,9 @@
-import os
+"""
+Envirement Setup for fixtures.
+"""
+from __future__ import absolute_import
 
+import os
 
 HOSTNAME = os.environ.get('BOK_CHOY_HOSTNAME', 'localhost')
 CMS_PORT = os.environ.get('BOK_CHOY_CMS_PORT', '8031')
diff --git a/common/test/acceptance/fixtures/base.py b/common/test/acceptance/fixtures/base.py
index c0a4cad483..a327a3157c 100644
--- a/common/test/acceptance/fixtures/base.py
+++ b/common/test/acceptance/fixtures/base.py
@@ -1,9 +1,12 @@
 """
 Common code shared by course and library fixtures.
 """
+from __future__ import absolute_import
+
 import json
 
 import requests
+import six
 from lazy import lazy
 
 from common.test.acceptance.fixtures import STUDIO_BASE_URL
@@ -164,7 +167,7 @@ class XBlockContainerFixture(StudioApiFixture):
         Encode `post_dict` (a dictionary) as UTF-8 encoded JSON.
         """
         return json.dumps({
-            k: v.encode('utf-8') if isinstance(v, basestring) else v
+            k: v.encode('utf-8') if isinstance(v, six.string_types) else v
             for k, v in post_dict.items()
         })
 
diff --git a/common/test/acceptance/fixtures/catalog.py b/common/test/acceptance/fixtures/catalog.py
index 4d1bdea678..c09309eb39 100644
--- a/common/test/acceptance/fixtures/catalog.py
+++ b/common/test/acceptance/fixtures/catalog.py
@@ -1,6 +1,8 @@
 """
 Tools to create catalog-related data for use in bok choy tests.
 """
+from __future__ import absolute_import
+
 import json
 
 import requests
diff --git a/common/test/acceptance/fixtures/certificates.py b/common/test/acceptance/fixtures/certificates.py
index cf3e452406..876e8aa1ff 100644
--- a/common/test/acceptance/fixtures/certificates.py
+++ b/common/test/acceptance/fixtures/certificates.py
@@ -2,6 +2,8 @@
 Tools for creating certificates config fixture data.
 """
 
+from __future__ import absolute_import
+
 import json
 
 from common.test.acceptance.fixtures import STUDIO_BASE_URL
diff --git a/common/test/acceptance/fixtures/course.py b/common/test/acceptance/fixtures/course.py
index f9ac1c9c1c..12834b1a66 100644
--- a/common/test/acceptance/fixtures/course.py
+++ b/common/test/acceptance/fixtures/course.py
@@ -2,12 +2,15 @@
 Fixture to create a course and course components (XBlocks).
 """
 
+from __future__ import absolute_import
+
 import datetime
 import json
 import mimetypes
 from collections import namedtuple
 from textwrap import dedent
 
+import six
 from opaque_keys.edx.keys import CourseKey
 from path import Path
 
@@ -255,7 +258,7 @@ class CourseFixture(XBlockContainerFixture):
             block_id = self._course_dict['run']
         else:
             block_id = 'course'
-        return unicode(course_key.make_usage_key('course', block_id))
+        return six.text_type(course_key.make_usage_key('course', block_id))
 
     @property
     def _assets_url(self):
@@ -270,7 +273,7 @@ class CourseFixture(XBlockContainerFixture):
         Return the locator string for the course handouts
         """
         course_key = CourseKey.from_string(self._course_key)
-        return unicode(course_key.make_usage_key('course_info', 'handouts'))
+        return six.text_type(course_key.make_usage_key('course_info', 'handouts'))
 
     def _create_course(self):
         """
diff --git a/common/test/acceptance/fixtures/edxnotes.py b/common/test/acceptance/fixtures/edxnotes.py
index f8bfc1bd18..4d49ff47e1 100644
--- a/common/test/acceptance/fixtures/edxnotes.py
+++ b/common/test/acceptance/fixtures/edxnotes.py
@@ -2,6 +2,8 @@
 Tools for creating edxnotes content fixture data.
 """
 
+from __future__ import absolute_import
+
 import json
 
 import factory
diff --git a/common/test/acceptance/fixtures/library.py b/common/test/acceptance/fixtures/library.py
index 5e6b1af68e..70eda71c51 100644
--- a/common/test/acceptance/fixtures/library.py
+++ b/common/test/acceptance/fixtures/library.py
@@ -2,6 +2,9 @@
 Fixture to create a Content Library
 """
 
+from __future__ import absolute_import
+
+import six
 from opaque_keys.edx.keys import CourseKey
 
 from common.test.acceptance.fixtures import STUDIO_BASE_URL
@@ -62,7 +65,7 @@ class LibraryFixture(XBlockContainerFixture):
         Return the locator string for the LibraryRoot XBlock that is the root of the library hierarchy.
         """
         lib_key = CourseKey.from_string(self._library_key)
-        return unicode(lib_key.make_usage_key('library', 'library'))
+        return six.text_type(lib_key.make_usage_key('library', 'library'))
 
     def _create_library(self):
         """