Merge pull request #21081 from edx/INCR-420

INCR-420 python3 compatibility

common/test/acceptance/pages/studio/container.py

@@ -2,6 +2,8 @@
 Container page in Studio
 """
 
+from __future__ import absolute_import
+
 from bok_choy.page_object import PageObject
 from bok_choy.promise import EmptyPromise, Promise
 

common/test/acceptance/pages/studio/course_page.py

@@ -1,9 +1,12 @@
 """
 Base class for pages specific to a course in Studio.
 """
+from __future__ import absolute_import
+
 import os
 from abc import abstractmethod
 
+import six
 from bok_choy.page_object import PageObject
 from opaque_keys.edx.locator import CourseLocator
 
@@ -56,4 +59,4 @@ class CoursePage(PageObject, HelpMixin):
             self.course_info['course_run'],
             deprecated=(default_store == 'draft')
         )
-        return "/".join([BASE_URL, self.url_path, unicode(course_key)])
+        return "/".join([BASE_URL, self.url_path, six.text_type(course_key)])

common/test/acceptance/pages/studio/discussion_component_editor.py

@@ -1,8 +1,10 @@
 """
 Discussion component editor in studio
 """
-from common.test.acceptance.pages.studio.xblock_editor import XBlockEditorView
+from __future__ import absolute_import
+
 from common.test.acceptance.pages.common.utils import click_css
+from common.test.acceptance.pages.studio.xblock_editor import XBlockEditorView
 
 
 class DiscussionComponentEditor(XBlockEditorView):

common/test/acceptance/pages/studio/html_component_editor.py

@@ -1,9 +1,13 @@
 """
 HTML component editor in studio
 """
-from common.test.acceptance.pages.studio.utils import type_in_codemirror, get_codemirror_value
-from common.test.acceptance.pages.studio.xblock_editor import XBlockEditorView
+from __future__ import absolute_import
+
+from six.moves import zip
+
 from common.test.acceptance.pages.common.utils import click_css
+from common.test.acceptance.pages.studio.utils import get_codemirror_value, type_in_codemirror
+from common.test.acceptance.pages.studio.xblock_editor import XBlockEditorView
 
 
 class HtmlXBlockEditorView(XBlockEditorView):
@@ -68,7 +72,7 @@ class HtmlXBlockEditorView(XBlockEditorView):
             font = font.replace('font-family: ', '').replace(';', '')
             font_families[index] = font.split(',')
             font_families[index] = [x.lstrip() for x in font_families[index]]
-        font_dict = dict(zip(font_labels, font_families))
+        font_dict = dict(list(zip(font_labels, font_families)))
         return font_dict
 
     def set_content_and_save(self, content, raw=False):

common/test/acceptance/pages/studio/problem_editor.py

@@ -1,9 +1,13 @@
 """
 Studio Problem Editor
 """
-from common.test.acceptance.pages.studio.xblock_editor import XBlockEditorView
-from common.test.acceptance.pages.common.utils import click_css
+from __future__ import absolute_import
+
 from selenium.webdriver.support.ui import Select
+from six.moves import range
+
+from common.test.acceptance.pages.common.utils import click_css
+from common.test.acceptance.pages.studio.xblock_editor import XBlockEditorView
 
 
 class ProblemXBlockEditorView(XBlockEditorView):

common/test/acceptance/pages/studio/settings.py

@@ -2,10 +2,11 @@
 """
 Course Schedule and Details Settings page.
 """
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
 
 import os
 
+import six
 from bok_choy.javascript import requirejs
 from bok_choy.promise import EmptyPromise
 
@@ -77,7 +78,7 @@ class SettingsPage(CoursePage):
         Set the values of the elements to those specified
         in the element_values dict.
         """
-        for css, value in element_values.iteritems():
+        for css, value in six.iteritems(element_values):
             element = self.get_element(css)
             element.clear()
             element.send_keys(value)

common/test/acceptance/pages/studio/signup.py

@@ -1,6 +1,8 @@
 """
 Signup page for studio
 """
+from __future__ import absolute_import
+
 from bok_choy.page_object import PageObject
 
 from common.test.acceptance.pages.common.utils import click_css

common/test/acceptance/pages/studio/utils.py

@@ -1,6 +1,8 @@
 """
 Utility methods useful for Studio page tests.
 """
+from __future__ import absolute_import
+
 from bok_choy.javascript import js_defined
 from bok_choy.promise import EmptyPromise
 from selenium.webdriver.common.action_chains import ActionChains
@@ -230,7 +232,7 @@ def verify_ordering(test_class, page, expected_orderings):
     blocks_checked = set()
     for expected_ordering in expected_orderings:
         for xblock in xblocks:
-            parent = expected_ordering.keys()[0]
+            parent = list(expected_ordering.keys())[0]
             if xblock.name == parent:
                 blocks_checked.add(parent)
                 children = xblock.children

common/test/acceptance/pages/studio/video/video.py

@@ -1,6 +1,8 @@
 """
 CMS Video
 """
+from __future__ import absolute_import
+
 import os
 import time
 
@@ -9,6 +11,7 @@ from bok_choy.javascript import js_defined, wait_for_js
 from bok_choy.promise import EmptyPromise, Promise
 from selenium.webdriver.common.action_chains import ActionChains
 from selenium.webdriver.common.keys import Keys
+from six.moves import range
 
 from common.test.acceptance.pages.common.utils import sync_on_notification
 from common.test.acceptance.pages.lms.video.video import VideoPage
@@ -627,7 +630,7 @@ class VideoComponentPage(VideoPage):
         if field_numbers:
             index_list = [number - 1 for number in field_numbers]
         else:
-            index_list = range(3)  # maximum three fields
+            index_list = list(range(3))  # maximum three fields
 
         statuses = {}
         for index in index_list: