Bug 1559975 - Fix python2 lint issues on testing/firefox-ui r=catlee

Differential Revision: https://phabricator.services.mozilla.com/D35255

--HG--
extra : moz-landing-system : lando

testing/firefox-ui/harness/firefox_ui_harness/__init__.py

@@ -2,7 +2,9 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+from __future__ import absolute_import
+
 __version__ = '1.4.0'
 
-import cli_functional
-import cli_update
+from . import cli_functional
+from . import cli_update

testing/firefox-ui/harness/firefox_ui_harness/arguments/__init__.py

@@ -2,5 +2,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+from __future__ import absolute_import
 from firefox_ui_harness.arguments.base import FirefoxUIArguments
 from firefox_ui_harness.arguments.update import UpdateArguments

testing/firefox-ui/harness/firefox_ui_harness/arguments/base.py

@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+from __future__ import absolute_import
 from marionette_harness import BaseMarionetteArguments
 
 

testing/firefox-ui/harness/firefox_ui_harness/arguments/update.py

@@ -2,7 +2,8 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-from base import FirefoxUIArguments
+from __future__ import absolute_import
+from .base import FirefoxUIArguments
 
 
 class UpdateBaseArguments(object):

testing/firefox-ui/harness/firefox_ui_harness/cli_functional.py

@@ -4,6 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+from __future__ import absolute_import
 from marionette_harness.runtests import cli as mn_cli
 
 from firefox_ui_harness.arguments import FirefoxUIArguments

testing/firefox-ui/harness/firefox_ui_harness/cli_update.py

@@ -4,6 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+from __future__ import absolute_import
 from marionette_harness.runtests import cli as mn_cli
 
 from firefox_ui_harness.arguments import UpdateArguments

testing/firefox-ui/harness/firefox_ui_harness/runners/__init__.py

@@ -2,5 +2,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+from __future__ import absolute_import
 from firefox_ui_harness.runners.base import FirefoxUITestRunner
 from firefox_ui_harness.runners.update import UpdateTestRunner

testing/firefox-ui/harness/firefox_ui_harness/runners/base.py

@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+from __future__ import absolute_import
 import os
 import shutil
 import tempfile

testing/firefox-ui/harness/firefox_ui_harness/runners/update.py

@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+from __future__ import absolute_import
 import os
 import sys
 

testing/firefox-ui/harness/firefox_ui_harness/testcases.py

@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+from __future__ import absolute_import
 import os
 import pprint
 from datetime import datetime

testing/firefox-ui/harness/setup.py

@@ -3,6 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
+from __future__ import absolute_import
 import os
 import re
 from setuptools import setup, find_packages

testing/firefox-ui/tests/functional/keyboard_shortcuts/test_browser_window.py

@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+from __future__ import absolute_import
 from firefox_puppeteer import PuppeteerMixin
 from marionette_driver import Wait
 from marionette_harness import MarionetteTestCase

testing/firefox-ui/tests/functional/private_browsing/test_about_private_browsing.py

@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+from __future__ import absolute_import
 from firefox_puppeteer import PuppeteerMixin
 from firefox_puppeteer.ui.browser.window import BrowserWindow
 from marionette_driver import By, Wait

testing/firefox-ui/tests/functional/safebrowsing/test_initial_download.py

@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+from __future__ import absolute_import
 import os
 
 from firefox_puppeteer import PuppeteerMixin

testing/firefox-ui/tests/functional/safebrowsing/test_notification.py

@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+from __future__ import absolute_import
 import time
 
 from firefox_puppeteer import PuppeteerMixin

testing/firefox-ui/tests/functional/safebrowsing/test_warning_pages.py

@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+from __future__ import absolute_import
 import time
 
 from firefox_puppeteer import PuppeteerMixin

testing/firefox-ui/tests/functional/security/test_dv_certificate.py

@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+from __future__ import absolute_import
 from firefox_puppeteer import PuppeteerMixin
 from marionette_driver import Wait
 from marionette_harness import MarionetteTestCase

testing/firefox-ui/tests/functional/security/test_enable_privilege.py

@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+from __future__ import absolute_import
 from marionette_driver import By
 from marionette_harness import MarionetteTestCase
 

testing/firefox-ui/tests/functional/security/test_ev_certificate.py

@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+from __future__ import absolute_import
 from firefox_puppeteer import PuppeteerMixin
 from marionette_driver import Wait
 from marionette_harness import MarionetteTestCase

testing/firefox-ui/tests/functional/security/test_mixed_content_page.py

@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+from __future__ import absolute_import
 from firefox_puppeteer import PuppeteerMixin
 from marionette_harness import MarionetteTestCase
 

testing/firefox-ui/tests/functional/security/test_mixed_script_content_blocking.py

@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+from __future__ import absolute_import
 from firefox_puppeteer import PuppeteerMixin
 from marionette_driver import By, Wait
 from marionette_harness import MarionetteTestCase

testing/firefox-ui/tests/functional/security/test_no_certificate.py

@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+from __future__ import absolute_import
 from urlparse import urlparse
 
 from firefox_puppeteer import PuppeteerMixin

testing/firefox-ui/tests/functional/security/test_security_notification.py

@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+from __future__ import absolute_import
 import time
 
 from firefox_puppeteer import PuppeteerMixin

testing/firefox-ui/tests/functional/security/test_ssl_disabled_error_page.py

@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+from __future__ import absolute_import
 import time
 
 from firefox_puppeteer import PuppeteerMixin

testing/firefox-ui/tests/functional/security/test_ssl_status_after_restart.py

@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+from __future__ import absolute_import
 from firefox_puppeteer import PuppeteerMixin
 from marionette_driver import Wait
 from marionette_harness import MarionetteTestCase, skip_if_e10s

testing/firefox-ui/tests/functional/security/test_submit_unencrypted_info_warning.py

@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+from __future__ import absolute_import
 from firefox_puppeteer import PuppeteerMixin
 from marionette_driver import By, expected, Wait
 from marionette_driver.errors import NoAlertPresentException

testing/firefox-ui/tests/functional/security/test_unknown_issuer.py

@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+from __future__ import absolute_import
 import time
 
 from marionette_driver import By

testing/firefox-ui/tests/functional/security/test_untrusted_connection_error_page.py

@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+from __future__ import absolute_import
 import time
 
 from firefox_puppeteer import PuppeteerMixin

testing/firefox-ui/tests/functional/sessionstore/session_store_test_case.py

@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+from __future__ import absolute_import
 from firefox_puppeteer import PuppeteerMixin
 from marionette_harness import MarionetteTestCase
 

testing/firefox-ui/tests/functional/sessionstore/test_restore_windows_after_restart_and_quit.py

@@ -3,6 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # add this directory to the path
+from __future__ import absolute_import
 import sys
 import os
 sys.path.append(os.path.dirname(__file__))

testing/firefox-ui/tests/functional/sessionstore/test_restore_windows_after_windows_shutdown.py

@@ -3,6 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # add this directory to the path
+from __future__ import absolute_import
 import sys
 import os
 sys.path.append(os.path.dirname(__file__))

testing/firefox-ui/tests/puppeteer/test_about_window.py

@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+from __future__ import absolute_import
 from firefox_puppeteer import PuppeteerMixin
 from firefox_puppeteer.ui.deck import Panel
 from marionette_harness import MarionetteTestCase

testing/firefox-ui/tests/puppeteer/test_appinfo.py

@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+from __future__ import absolute_import
 import mozversion
 
 from firefox_puppeteer import PuppeteerMixin

testing/firefox-ui/tests/puppeteer/test_l10n.py

@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+from __future__ import absolute_import
 from firefox_puppeteer import PuppeteerMixin
 from firefox_puppeteer.api.l10n import L10n
 from marionette_driver import By

testing/firefox-ui/tests/puppeteer/test_menubar.py

@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+from __future__ import absolute_import
 from firefox_puppeteer import PuppeteerMixin
 from marionette_driver.errors import NoSuchElementException
 from marionette_harness import MarionetteTestCase

testing/firefox-ui/tests/puppeteer/test_notifications.py

@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+from __future__ import absolute_import
 from firefox_puppeteer import PuppeteerMixin
 from firefox_puppeteer.ui.browser.notifications import (
     AddOnInstallConfirmationNotification,

testing/firefox-ui/tests/puppeteer/test_page_info_window.py

@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+from __future__ import absolute_import
 from firefox_puppeteer import PuppeteerMixin
 from marionette_harness import MarionetteTestCase
 

testing/firefox-ui/tests/puppeteer/test_places.py

@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+from __future__ import absolute_import
 from firefox_puppeteer import PuppeteerMixin
 from marionette_driver import Wait
 from marionette_harness import MarionetteTestCase

testing/firefox-ui/tests/puppeteer/test_security.py

@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+from __future__ import absolute_import
 from firefox_puppeteer import PuppeteerMixin
 from firefox_puppeteer.errors import NoCertificateError
 from marionette_harness import MarionetteTestCase

testing/firefox-ui/tests/puppeteer/test_software_update.py

@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+from __future__ import absolute_import
 import os
 
 from firefox_puppeteer import PuppeteerMixin

testing/firefox-ui/tests/puppeteer/test_tabbar.py

@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+from __future__ import absolute_import
 from firefox_puppeteer import PuppeteerMixin
 from firefox_puppeteer.errors import NoCertificateError
 from marionette_harness import MarionetteTestCase

testing/firefox-ui/tests/puppeteer/test_toolbars.py

@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+from __future__ import absolute_import
 from firefox_puppeteer import PuppeteerMixin
 from marionette_driver import expected, By, Wait
 from marionette_driver.errors import NoSuchElementException

testing/firefox-ui/tests/puppeteer/test_update_wizard.py

@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+from __future__ import absolute_import
 from firefox_puppeteer import PuppeteerMixin
 from firefox_puppeteer.ui.deck import Panel
 from firefox_puppeteer.ui.update_wizard import UpdateWizardDialog

testing/firefox-ui/tests/puppeteer/test_utils.py

@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+from __future__ import absolute_import
 from firefox_puppeteer import PuppeteerMixin
 from marionette_harness import MarionetteTestCase
 

testing/firefox-ui/tests/puppeteer/test_windows.py

@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+from __future__ import absolute_import
 import firefox_puppeteer.errors as errors
 
 from firefox_puppeteer import PuppeteerMixin

testing/firefox-ui/tests/update/direct/test_direct_update.py

@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+from __future__ import absolute_import
 from firefox_ui_harness.testcases import UpdateTestCase
 
 

testing/firefox-ui/tests/update/fallback/test_fallback_update.py

@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+from __future__ import absolute_import
 from firefox_ui_harness.testcases import UpdateTestCase
 
 

tools/lint/py2.yml

@@ -29,8 +29,6 @@ py2:
         - servo
         - taskcluster/docker/funsize-update-generator
         - testing/awsy
-        - testing/firefox-ui
-        - testing/geckodriver
         - testing/gtest
         - testing/mochitest
         - testing/mozharness