Merge pull request #21084 from edx/INCR-421

INCR-421 python3 compatibility

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

+"""
+Envirement setuo for studio video tests.
+"""
+from __future__ import absolute_import
+
 import os
 
 # Get the URL of the instance under test

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

@@ -2,6 +2,8 @@
 Course Checklists page.
 """
 
+from __future__ import absolute_import
+
 from common.test.acceptance.pages.studio.course_page import CoursePage
 
 

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

 """
 Course Updates page.
 """
+from __future__ import absolute_import
+
 from common.test.acceptance.pages.common.utils import click_css, confirm_prompt
 from common.test.acceptance.pages.studio.course_page import CoursePage
 from common.test.acceptance.pages.studio.utils import set_input_value, type_in_codemirror

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

@@ -2,6 +2,8 @@
 Edit Subsection page in Studio
 """
 
+from __future__ import absolute_import
+
 from bok_choy.page_object import PageObject
 
 

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

 """
 Pages page for a course.
 """
-from common.test.acceptance.pages.common.utils import click_css, confirm_prompt
-from common.test.acceptance.pages.studio.course_page import CoursePage
+from __future__ import absolute_import
+
 from bok_choy.promise import EmptyPromise
 from selenium.webdriver import ActionChains
 
+from common.test.acceptance.pages.common.utils import click_css, confirm_prompt
+from common.test.acceptance.pages.studio.course_page import CoursePage
+
 
 class PagesPage(CoursePage):
     """

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

 """
 Import/Export pages.
 """
+from __future__ import absolute_import
+
 import os
 import re
 import time
 from datetime import datetime
 
 import requests
+import six
 from bok_choy.promise import EmptyPromise
 
 from common.test.acceptance.pages.common.utils import click_css
@@ -216,7 +219,7 @@ class LibraryLoader(object):
         but is used for import/export.
         """
         # pylint: disable=no-member
-        return "/".join([BASE_URL, self.url_path, unicode(self.locator)])
+        return "/".join([BASE_URL, self.url_path, six.text_type(self.locator)])
 
 
 class ExportCoursePage(ExportMixin, TemplateCheckMixin, CoursePage):

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

 """
 Move XBlock Modal Page Object
 """
+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/overview.py

 """
 Course Outline page in Studio.
 """
+from __future__ import absolute_import
+
 import datetime
 
 from bok_choy.javascript import js_defined, wait_for_js
@@ -9,6 +11,7 @@ from bok_choy.promise import EmptyPromise
 from selenium.webdriver import ActionChains
 from selenium.webdriver.common.keys import Keys
 from selenium.webdriver.support.ui import Select
+from six.moves import map, range
 
 from common.test.acceptance.pages.common.utils import click_css, confirm_prompt
 from common.test.acceptance.pages.studio.container import ContainerPage
@@ -1000,15 +1003,15 @@ class CourseOutlineModal(object):
         """
         Set `date` value to input pointed by `selector` and `property_name`.
         """
-        month, day, year = map(int, date.split('/'))
+        month, day, year = list(map(int, date.split('/')))
         self.click(input_selector)
         if getattr(self, property_name):
-            current_month, current_year = map(int, getattr(self, property_name).split('/')[1:])
+            current_month, current_year = list(map(int, getattr(self, property_name).split('/')[1:]))
         else:  # Use default timepicker values, which are current month and year.
             current_month, current_year = datetime.datetime.today().month, datetime.datetime.today().year
         date_diff = 12 * (year - current_year) + month - current_month
         selector = u"a.ui-datepicker-{}".format('next' if date_diff > 0 else 'prev')
-        for __ in xrange(abs(date_diff)):
+        for __ in range(abs(date_diff)):
             self.page.q(css=selector).click()
         self.page.q(css="a.ui-state-default").nth(day - 1).click()  # set day
         self.page.wait_for_element_invisibility("#ui-datepicker-div", "datepicker should be closed")

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

@@ -2,6 +2,9 @@
 Course Advanced Settings page
 """
 
+from __future__ import absolute_import
+
+import six
 from bok_choy.promise import EmptyPromise
 
 from common.test.acceptance.pages.studio.course_page import CoursePage
@@ -100,7 +103,7 @@ class AdvancedSettingsPage(CoursePage):
         """
         cordinates_dict = self.browser.find_element_by_css_selector(coordinates_for)
         location = cordinates_dict.location
-        for key, val in location.iteritems():
+        for key, val in six.iteritems(location):
             if key == 'x':
                 x_axis = val
             elif key == 'y':
@@ -175,7 +178,7 @@ class AdvancedSettingsPage(CoursePage):
         """
         Make multiple settings changes and save them.
         """
-        for key, value in key_value_map.iteritems():
+        for key, value in six.iteritems(key_value_map):
             index = self._get_index_of(key)
             type_in_codemirror(self, index, value)
 

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

+"""
+Acceptance test xblock-editor.
+"""
+from __future__ import absolute_import
+
 from bok_choy.page_object import PageObject
 from selenium.webdriver.common.keys import Keys
 from selenium.webdriver.support.ui import Select