diff --git a/common/test/acceptance/pages/studio/__init__.py b/common/test/acceptance/pages/studio/__init__.py index 5f219c6052..30e89ba99c 100644 --- a/common/test/acceptance/pages/studio/__init__.py +++ b/common/test/acceptance/pages/studio/__init__.py @@ -1,3 +1,8 @@ +""" +Envirement setuo for studio video tests. +""" +from __future__ import absolute_import + import os # Get the URL of the instance under test diff --git a/common/test/acceptance/pages/studio/checklists.py b/common/test/acceptance/pages/studio/checklists.py index 7d8545a8cc..3a9d566c9c 100644 --- a/common/test/acceptance/pages/studio/checklists.py +++ b/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 diff --git a/common/test/acceptance/pages/studio/course_info.py b/common/test/acceptance/pages/studio/course_info.py index 7ceccb4c92..01e5f576b5 100644 --- a/common/test/acceptance/pages/studio/course_info.py +++ b/common/test/acceptance/pages/studio/course_info.py @@ -1,6 +1,8 @@ """ 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 diff --git a/common/test/acceptance/pages/studio/edit_subsection.py b/common/test/acceptance/pages/studio/edit_subsection.py index 7560478973..d3fb716d86 100644 --- a/common/test/acceptance/pages/studio/edit_subsection.py +++ b/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 diff --git a/common/test/acceptance/pages/studio/edit_tabs.py b/common/test/acceptance/pages/studio/edit_tabs.py index 736f79cf95..623aaef4f5 100644 --- a/common/test/acceptance/pages/studio/edit_tabs.py +++ b/common/test/acceptance/pages/studio/edit_tabs.py @@ -1,11 +1,14 @@ """ 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): """ diff --git a/common/test/acceptance/pages/studio/import_export.py b/common/test/acceptance/pages/studio/import_export.py index 130d12a9a2..2d048b360f 100644 --- a/common/test/acceptance/pages/studio/import_export.py +++ b/common/test/acceptance/pages/studio/import_export.py @@ -1,12 +1,15 @@ """ 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): diff --git a/common/test/acceptance/pages/studio/move_xblock.py b/common/test/acceptance/pages/studio/move_xblock.py index 96f794c4f1..baa0083a58 100644 --- a/common/test/acceptance/pages/studio/move_xblock.py +++ b/common/test/acceptance/pages/studio/move_xblock.py @@ -1,6 +1,8 @@ """ 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 diff --git a/common/test/acceptance/pages/studio/overview.py b/common/test/acceptance/pages/studio/overview.py index a056463fe3..797604710a 100644 --- a/common/test/acceptance/pages/studio/overview.py +++ b/common/test/acceptance/pages/studio/overview.py @@ -1,6 +1,8 @@ """ 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") diff --git a/common/test/acceptance/pages/studio/settings_advanced.py b/common/test/acceptance/pages/studio/settings_advanced.py index 69372af6de..63eb0130bc 100644 --- a/common/test/acceptance/pages/studio/settings_advanced.py +++ b/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) diff --git a/common/test/acceptance/pages/studio/xblock_editor.py b/common/test/acceptance/pages/studio/xblock_editor.py index 21f0e6406c..bb427d51b9 100644 --- a/common/test/acceptance/pages/studio/xblock_editor.py +++ b/common/test/acceptance/pages/studio/xblock_editor.py @@ -1,3 +1,8 @@ +""" +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