Merge lp:~canonical-platform-qa/unity8/nopy2 into lp:unity8

[Leo Arias]

Drop the support for python2 in autopilot tests.

 * Are there any related MPs required for this MP to build/function as expected? Please list.

No required MPs.

 * Did you perform an exploratory manual test run of your code change and any related functionality?

No, just ran the tests.

 * Did you make sure that your branch does not contain spurious tags?

Yes.

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

Yes.

 * If you changed the UI, has there been a design review?

No UI changes.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1628
http://jenkins.qa.ubuntu.com/job/unity8-ci/5355/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1489
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/519
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/520
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/520
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1323
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1487
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1487/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18282

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5355/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1628
http://jenkins.qa.ubuntu.com/job/unity8-ci/5356/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1491
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/520
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/521
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/521
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1325
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1489
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1489/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18286

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5356/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1630
http://jenkins.qa.ubuntu.com/job/unity8-ci/5380/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1613
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/544
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/545
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/545
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1432
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1611
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1611/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18493

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5380/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Are you doing the same for ubuntu-ui-toolkit-autopilot ? Otherwise it still pulls python 2.7 on the dependency chain for us.

Anyway this looks good

* Did you perform an exploratory manual test run of the code change and any related functionality?
Tests are still fine

* Did CI run pass?
No, but unrelated to this

* Did you make sure that the branch does not contain spurious tags?
Yes

review: Approve

[Leo Arias (elopio)]

> Are you doing the same for ubuntu-ui-toolkit-autopilot ? Otherwise it still
> pulls python 2.7 on the dependency chain for us.

Not yet. We need to dig a little on all the suites before removing it from the toolkit.
Unity was easier because only a handful of suites depend on it.

[Michał Sawicz (saviq)]

Hey, while cleaning this up, IIUC we should replace libautopilot-qt dependency with autopilot-qt5 to prevent unnecessary qt4 installation.

[Leo Arias (elopio)]

> Hey, while cleaning this up, IIUC we should replace libautopilot-qt dependency
> with autopilot-qt5 to prevent unnecessary qt4 installation.

https://code.launchpad.net/~canonical-platform-qa/unity8/remove-qt4dep/+merge/252118

We also need to remove it from the toolkit: https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1429158

=== modified file 'CODING'
--- CODING	2014-09-26 10:02:48 +0000
+++ CODING	2015-03-03 04:24:40 +0000
@@ -24,7 +24,7 @@
 
   this will:
   - install the required dependencies to build, as well as run on the desktop
-  - it should also install unity-scope-home and unity-lens-application which 
+  - it should also install unity-scope-home and unity-lens-application which
     are technically "recommends", not strict dependencies
 
 build Unity 8
@@ -104,8 +104,8 @@
   - it's unsafe - anyone can connect to your device
   - with TCP the Nexus 10 doesn't drop the adb connection when locking
     the screen
-- exporting ANDROID_SERIAL=$your_device_serial or 
-  ANDROID_SERIAL=$your_device_ip:5555 will make adb not complain about 
+- exporting ANDROID_SERIAL=$your_device_serial or
+  ANDROID_SERIAL=$your_device_ip:5555 will make adb not complain about
   multiple devices
 - you can export TARGET_IP=$your_device_ip TARGET_SSH_PORT=22 for run_on_device.sh
   to not use adb forwarding - useful if you use multiple devices
@@ -190,8 +190,8 @@
 
 And then run a single test with
 
-$ PYTHONPATH=../tests/autopilot autopilot run unity8.some.very.long.test.name
+$ PYTHONPATH=../tests/autopilot autopilot3 run unity8.some.very.long.test.name
 
 or run them all with
 
-$ PYTHONPATH=../tests/autopilot autopilot run unity8
+$ PYTHONPATH=../tests/autopilot autopilot3 run unity8

=== modified file 'cmake/modules/autopilot.cmake'
--- cmake/modules/autopilot.cmake	2014-07-31 14:06:09 +0000
+++ cmake/modules/autopilot.cmake	2015-03-03 04:24:40 +0000
@@ -13,12 +13,4 @@
 
     add_dependencies(autopilot autopilot-${TEST_NAME})
 
-    add_custom_target(autopilot2-${TEST_NAME}
-        COMMAND UNITY_TESTING=1 LANG=C QML2_IMPORT_PATH=${SHELL_INSTALL_QML}/mocks python2 -m autopilot.run run ${TEST_SUITE}
-        WORKING_DIRECTORY ${WORKING_DIR}
-        DEPENDS fake_install
-    )
-
-    add_dependencies(autopilot autopilot2-${TEST_NAME})
-
 endfunction()

=== modified file 'debian/control'
--- debian/control	2015-02-13 17:05:08 +0000
+++ debian/control	2015-03-03 04:24:40 +0000
@@ -31,10 +31,8 @@
                libusermetricsoutput1-dev,
                libxcb1-dev,
                pkg-config,
-               python-setuptools,
                python3-all:any,
                python3-setuptools,
-               python:any (>= 2.7),
                qml-module-qt-labs-folderlistmodel,
                qml-module-qtquick-layouts,
                qml-module-qtquick-xmllistmodel,
@@ -144,11 +142,6 @@
          libautopilot-qt (>= 1.4),
          libqt5test5,
          libqt5widgets5,
-         python-autopilot,
-         python-evdev,
-         python-fixtures,
-         python-gi,
-         python-mock,
          python3-autopilot,
          python3-evdev,
          python3-fixtures,
@@ -160,7 +153,6 @@
          url-dispatcher-tools,
          ${misc:Depends},
          ${python3:Depends},
-         ${python:Depends},
          ${shlibs:Depends},
 Description: Test package for Unity 8 shell
  Autopilot tests for the unity8 package

=== modified file 'debian/rules'
--- debian/rules	2015-02-26 19:39:54 +0000
+++ debian/rules	2015-03-03 04:24:40 +0000
@@ -14,7 +14,7 @@
 export CXX=$(DEB_HOST_GNU_TYPE)-g++-4.9
 
 %:
-	dh $@ --parallel --fail-missing --with python2,python3
+	dh $@ --parallel --fail-missing --with python3
 
 override_dh_auto_clean:
 	dh_auto_clean
@@ -32,7 +32,7 @@
 override_dh_install:
 	# install autopilot tests
 	cd tests/autopilot; \
-	set -ex; for python in $(shell pyversions -r) $(shell py3versions -r); do \
+	set -ex; for python in $(shell py3versions -r); do \
 	    $$python setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb; \
 	done; \
 	cd $(CURDIR)

=== modified file 'tests/autopilot/setup.py'
--- tests/autopilot/setup.py	2013-07-23 09:54:32 +0000
+++ tests/autopilot/setup.py	2015-03-03 04:24:40 +0000
@@ -1,8 +1,8 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
 # Unity Autopilot Test Suite
-# Copyright (C) 2012-2013 Canonical
+# Copyright (C) 2012, 2013, 2015 Canonical
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'tests/autopilot/unity8/application_lifecycle/tests/__init__.py'
--- tests/autopilot/unity8/application_lifecycle/tests/__init__.py	2014-06-11 15:36:51 +0000
+++ tests/autopilot/unity8/application_lifecycle/tests/__init__.py	2015-03-03 04:24:40 +0000
@@ -1,7 +1,7 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
 # Unity Autopilot Test Suite
-# Copyright (C) 2014 Canonical
+# Copyright (C) 2014, 2015 Canonical
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -28,7 +28,7 @@
 class ApplicationLifeCycleTestCase(tests.UnityTestCase):
 
     def setUp(self):
-        super(ApplicationLifeCycleTestCase, self).setUp()
+        super().setUp()
         self._qml_mock_enabled = False
         self._data_dirs_mock_enabled = False
         unity_proxy = self.launch_unity()

=== modified file 'tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py'
--- tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py	2014-12-01 12:57:57 +0000
+++ tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py	2015-03-03 04:24:40 +0000
@@ -1,7 +1,7 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
 # Unity Autopilot Test Suite
-# Copyright (C) 2013, 2014 Canonical
+# Copyright (C) 2013, 2014, 2015 Canonical
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,8 +19,6 @@
 
 """Tests for the application lifecycle."""
 
-from __future__ import absolute_import
-
 import logging
 import os
 
@@ -40,7 +38,7 @@
     def setUp(self):
         if model() == 'Desktop':
             self.skipTest('Test cannot be run on the desktop.')
-        super(ApplicationLifecycleTests, self).setUp()
+        super().setUp()
 
     def swipe_screen_from_right(self):
         width = self.main_window.width

=== modified file 'tests/autopilot/unity8/application_lifecycle/tests/test_url_dispatcher.py'
--- tests/autopilot/unity8/application_lifecycle/tests/test_url_dispatcher.py	2014-07-31 05:52:29 +0000
+++ tests/autopilot/unity8/application_lifecycle/tests/test_url_dispatcher.py	2015-03-03 04:24:40 +0000
@@ -1,7 +1,7 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
 # Unity Autopilot Test Suite
-# Copyright (C) 2014 Canonical
+# Copyright (C) 2014, 2015 Canonical
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -32,7 +32,7 @@
     def setUp(self):
         if platform.model() == 'Desktop':
             self.skipTest("URL dispatcher doesn't work on the desktop.")
-        super(URLDispatcherTestCase, self).setUp()
+        super().setUp()
 
     def test_swipe_out_application_started_by_url_dispatcher(self):
         _, desktop_file_path = self.create_test_application()

=== modified file 'tests/autopilot/unity8/fixture_setup.py'
--- tests/autopilot/unity8/fixture_setup.py	2015-01-22 13:11:51 +0000
+++ tests/autopilot/unity8/fixture_setup.py	2015-03-03 04:24:40 +0000
@@ -38,13 +38,13 @@
         :type variables: A dictionary.
 
         """
-        super(LaunchDashApp, self).__init__()
+        super().__init__()
         self.binary_path = binary_path
         self.variables = variables
 
     def setUp(self):
         """Launch the dash app when the fixture is used."""
-        super(LaunchDashApp, self).setUp()
+        super().setUp()
         self.addCleanup(self.stop_application)
         self.application_proxy = self.launch_application()
 
@@ -69,11 +69,11 @@
 class DisplayRotationLock(fixtures.Fixture):
 
     def __init__(self, enable):
-        super(DisplayRotationLock, self).__init__()
+        super().__init__()
         self.enable = enable
 
     def setUp(self):
-        super(DisplayRotationLock, self).setUp()
+        super().setUp()
         original_state = self._is_rotation_lock_enabled()
         if self.enable != original_state:
             self.addCleanup(self._set_rotation_lock, original_state)

=== modified file 'tests/autopilot/unity8/indicators/__init__.py'
--- tests/autopilot/unity8/indicators/__init__.py	2015-01-21 04:15:31 +0000
+++ tests/autopilot/unity8/indicators/__init__.py	2015-03-03 04:24:40 +0000
@@ -34,7 +34,7 @@
         return False
 
 
-class DisplayIndicator(object):
+class DisplayIndicator():
 
     def __init__(self, main_window):
         self._main_window = main_window

=== modified file 'tests/autopilot/unity8/indicators/tests/__init__.py'
--- tests/autopilot/unity8/indicators/tests/__init__.py	2015-01-20 17:56:49 +0000
+++ tests/autopilot/unity8/indicators/tests/__init__.py	2015-03-03 04:24:40 +0000
@@ -29,6 +29,6 @@
     def setUp(self):
         if platform.model() == 'Desktop':
             self.skipTest('Test cannot be run on the desktop.')
-        super(IndicatorTestCase, self).setUp()
+        super().setUp()
         self.unity_proxy = self.launch_unity()
         process_helpers.unlock_unity(self.unity_proxy)

=== modified file 'tests/autopilot/unity8/indicators/tests/test_indicators.py'
--- tests/autopilot/unity8/indicators/tests/test_indicators.py	2015-01-20 17:56:49 +0000
+++ tests/autopilot/unity8/indicators/tests/test_indicators.py	2015-03-03 04:24:40 +0000
@@ -16,8 +16,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import absolute_import
-
 from testscenarios import multiply_scenarios
 
 from autopilot import platform
@@ -42,7 +40,7 @@
     )
 
     def setUp(self):
-        super(IndicatorExistsTestCase, self).setUp()
+        super().setUp()
         if (platform.model() == 'Nexus 10' and
                 self.indicator_name == 'indicator-bluetooth'):
             self.skipTest('Nexus 10 does not have bluetooth at the moment.')
@@ -77,7 +75,7 @@
     )
 
     def setUp(self):
-        super(IndicatorPageTitleMatchesWidgetTestCase, self).setUp()
+        super().setUp()
         if (platform.model() == 'Nexus 10' and
                 self.indicator_name == 'indicator-bluetooth'):
             self.skipTest('Nexus 10 does not have bluetooth at the moment.')

=== modified file 'tests/autopilot/unity8/process_helpers.py'
--- tests/autopilot/unity8/process_helpers.py	2014-09-08 10:33:50 +0000
+++ tests/autopilot/unity8/process_helpers.py	2015-03-03 04:24:40 +0000
@@ -1,7 +1,7 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
 # Unity Autopilot Utilities
-# Copyright (C) 2013, 2014 Canonical
+# Copyright (C) 2013, 2014, 2015 Canonical
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,16 +19,9 @@
 
 import logging
 import subprocess
-import sys
 import dbus
 
-# This has to work in both python 3 (ap 1.5) and py2 (ap legacy 1.4.1) so we
-# pick the correct location in each case. Remove the py2 branch once we no
-# longer need to support python 2.
-if sys.version >= '3':
-    from autopilot.exceptions import ProcessSearchError
-else:
-    from autopilot.introspection import ProcessSearchError
+from autopilot.exceptions import ProcessSearchError
 from autopilot.introspection import get_proxy_object_for_existing_process
 
 from unity8.shell import emulators

=== modified file 'tests/autopilot/unity8/shell/__init__.py'
--- tests/autopilot/unity8/shell/__init__.py	2015-02-17 15:33:39 +0000
+++ tests/autopilot/unity8/shell/__init__.py	2015-03-03 04:24:40 +0000
@@ -1,7 +1,7 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
 # Unity Autopilot Test Suite
-# Copyright (C) 2012-2013 Canonical
+# Copyright (C) 2012-2015 Canonical
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -38,7 +38,7 @@
     return wrapper
 
 
-class DragMixin(object):
+class DragMixin():
     def _drag(self, x1, y1, x2, y2):
         # XXX This ugly code is here just temporarily, waiting for drag
         # improvements to land on autopilot so we don't have to access device

=== modified file 'tests/autopilot/unity8/shell/emulators/create_interactive_notification.py'
--- tests/autopilot/unity8/shell/emulators/create_interactive_notification.py	2015-01-06 12:16:51 +0000
+++ tests/autopilot/unity8/shell/emulators/create_interactive_notification.py	2015-03-03 04:24:40 +0000
@@ -1,10 +1,9 @@
-#!/usr/bin/env python
-from __future__ import print_function
+#!/usr/bin/env python3
 
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
 # Unity Autopilot Test Suite
-# Copyright (C) 2012-2013 Canonical
+# Copyright (C) 2012, 2013, 2014, 2015 Canonical
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'tests/autopilot/unity8/shell/emulators/dash.py'
--- tests/autopilot/unity8/shell/emulators/dash.py	2014-12-15 22:42:44 +0000
+++ tests/autopilot/unity8/shell/emulators/dash.py	2015-03-03 04:24:40 +0000
@@ -1,7 +1,7 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
 # Unity Autopilot Test Suite
-# Copyright (C) 2012, 2013, 2014 Canonical
+# Copyright (C) 2012, 2013, 2014, 2015 Canonical
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -30,7 +30,7 @@
 logger = logging.getLogger(__name__)
 
 
-class DashApp(object):
+class DashApp():
 
     """Autopilot helper for the Dash app."""
 
@@ -45,7 +45,7 @@
     """An emulator that understands the Dash."""
 
     def __init__(self, *args):
-        super(Dash, self).__init__(*args)
+        super().__init__(*args)
         self.dash_content_list = self.wait_select_single(
             'QQuickListView', objectName='dashContentList')
 

=== modified file 'tests/autopilot/unity8/shell/fixture_setup.py'
--- tests/autopilot/unity8/shell/fixture_setup.py	2015-02-03 15:16:58 +0000
+++ tests/autopilot/unity8/shell/fixture_setup.py	2015-03-03 04:24:40 +0000
@@ -1,7 +1,7 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
 # Unity Autopilot Test Suite
-# Copyright (C) 2014 Canonical
+# Copyright (C) 2014, 2015 Canonical
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -31,7 +31,7 @@
 class FakeScopes(fixtures.Fixture):
 
     def setUp(self):
-        super(FakeScopes, self).setUp()
+        super().setUp()
         self.useFixture(
             fixtures.EnvironmentVariable(
                 'QML2_IMPORT_PATH',

=== modified file 'tests/autopilot/unity8/shell/tests/__init__.py'
--- tests/autopilot/unity8/shell/tests/__init__.py	2015-02-05 20:21:00 +0000
+++ tests/autopilot/unity8/shell/tests/__init__.py	2015-03-03 04:24:40 +0000
@@ -1,7 +1,7 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
 # Unity Autopilot Test Suite
-# Copyright (C) 2012, 2013, 2014 Canonical
+# Copyright (C) 2012, 2013, 2014, 2015 Canonical
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -148,7 +148,7 @@
             sys.exit(2)
 
     def setUp(self):
-        super(UnityTestCase, self).setUp()
+        super().setUp()
         if is_unity7_running():
             self.useFixture(toolkit_fixtures.HideUnity7Launcher())
 
@@ -399,7 +399,7 @@
     environment = {}
 
     def setUp(self):
-        super(DashBaseTestCase, self).setUp()
+        super().setUp()
 
         if is_unity7_running():
             self.useFixture(toolkit_fixtures.HideUnity7Launcher())

=== modified file 'tests/autopilot/unity8/shell/tests/test_emulators.py'
--- tests/autopilot/unity8/shell/tests/test_emulators.py	2014-10-23 20:29:31 +0000
+++ tests/autopilot/unity8/shell/tests/test_emulators.py	2015-03-03 04:24:40 +0000
@@ -1,7 +1,7 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
 # Unity Autopilot Test Suite
-# Copyright (C) 2014 Canonical
+# Copyright (C) 2014, 2015 Canonical
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -38,7 +38,7 @@
     scenarios = tests._get_device_emulation_scenarios()
 
     def setUp(self):
-        super(MainWindowTestCase, self).setUp()
+        super().setUp()
         unity_proxy = self.launch_unity()
         process_helpers.unlock_unity(unity_proxy)
 
@@ -110,7 +110,7 @@
     def setUp(self):
         # Set up the fake scopes before launching unity.
         self.useFixture(fixture_setup.FakeScopes())
-        super(GenericScopeViewEmulatorTestCase, self).setUp()
+        super().setUp()
         self.generic_scope = self.dash.open_scope('MockScope1')
 
     def test_open_preview(self):
@@ -129,7 +129,7 @@
     def setUp(self):
         # Set up the fake scopes before launching unity.
         self.useFixture(fixture_setup.FakeScopes())
-        super(DashAppsEmulatorTestCase, self).setUp()
+        super().setUp()
         self.applications_scope = self.dash.open_scope('clickscope')
 
     def test_get_applications_should_return_correct_applications(self):

=== modified file 'tests/autopilot/unity8/shell/tests/test_lock_screen.py'
--- tests/autopilot/unity8/shell/tests/test_lock_screen.py	2015-02-05 20:21:00 +0000
+++ tests/autopilot/unity8/shell/tests/test_lock_screen.py	2015-03-03 04:24:40 +0000
@@ -1,7 +1,7 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
 # Unity Autopilot Test Suite
-# Copyright (C) 2012, 2013, 2014 Canonical
+# Copyright (C) 2012, 2013, 2014, 2015 Canonical
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,22 +17,14 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-
-from __future__ import absolute_import
-
 from unity8.shell.tests import UnityTestCase, _get_device_emulation_scenarios
 
 from autopilot.matchers import Eventually
-import sys
 from testtools.matchers import Equals
 import logging
 
 logger = logging.getLogger(__name__)
 
-# py2 compatible alias for py3
-if sys.version >= '3':
-    basestring = str
-
 
 class TestLockscreen(UnityTestCase):
 

=== modified file 'tests/autopilot/unity8/shell/tests/test_notifications.py'
--- tests/autopilot/unity8/shell/tests/test_notifications.py	2015-02-17 15:33:39 +0000
+++ tests/autopilot/unity8/shell/tests/test_notifications.py	2015-03-03 04:24:40 +0000
@@ -1,7 +1,7 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
 # Unity Autopilot Test Suite
-# Copyright (C) 2012, 2013, 2014 Canonical
+# Copyright (C) 2012, 2013, 2014, 2015 Canonical
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,8 +19,6 @@
 
 """Tests for Notifications"""
 
-from __future__ import absolute_import
-
 from unity8 import shell
 from unity8.process_helpers import unlock_unity
 from unity8.shell.tests import UnityTestCase, _get_device_emulation_scenarios
@@ -34,15 +32,9 @@
 import logging
 import signal
 import subprocess
-import sys
 
 logger = logging.getLogger(__name__)
 
-# from __future__ import range
-# (python3's range, is same as python2's xrange)
-if sys.version_info < (3,):
-    range = xrange
-
 
 class NotificationsBase(UnityTestCase):
     """Base class for all notification tests that provides helper methods."""
@@ -118,7 +110,7 @@
     """Collection of test for Interactive tests including snap decisions."""
 
     def setUp(self):
-        super(InteractiveNotificationBase, self).setUp()
+        super().setUp()
         # Need to keep track when we launch the notification script.
         self._notify_proc = None
 
@@ -338,7 +330,7 @@
             action_string = "%s,%s" % (action_id, action_label)
             script_args.extend(['--action', action_string])
 
-        python_bin = subprocess.check_output(['which', 'python']).strip()
+        python_bin = subprocess.check_output(['which', 'python3']).strip()
         command = [python_bin, self._get_notify_script()] + script_args
         logger.info("Launching snap-decision notification as: %s", command)
         self._notify_proc = subprocess.Popen(
@@ -410,7 +402,7 @@
     """Collection of tests for Emphemeral notifications (non-interactive.)"""
 
     def setUp(self):
-        super(EphemeralNotificationsTests, self).setUp()
+        super().setUp()
         # Because we are using the Notify library we need to init and un-init
         # otherwise we get crashes.
         Notify.init("Autopilot Ephemeral Notification Tests")

=== modified file 'tests/autopilot/unity8/shell/tests/test_tutorial.py'
--- tests/autopilot/unity8/shell/tests/test_tutorial.py	2015-02-05 17:22:12 +0000
+++ tests/autopilot/unity8/shell/tests/test_tutorial.py	2015-03-03 04:24:40 +0000
@@ -1,7 +1,7 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
 # Unity Autopilot Test Suite
-# Copyright (C) 2014 Canonical
+# Copyright (C) 2014, 2015 Canonical
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -31,7 +31,7 @@
 class TutorialTestCase(tests.UnityTestCase):
 
     def setUp(self):
-        super(TutorialTestCase, self).setUp()
+        super().setUp()
         self._qml_mock_enabled = False
         self._data_dirs_mock_enabled = False
 

=== modified file 'tests/autopilot/unity8/shell/tests/test_upstart.py'
--- tests/autopilot/unity8/shell/tests/test_upstart.py	2014-07-31 21:02:02 +0000
+++ tests/autopilot/unity8/shell/tests/test_upstart.py	2015-03-03 04:24:40 +0000
@@ -38,12 +38,6 @@
 
 logger = logging.getLogger(__name__)
 
-# from __future__ import range
-# (python3's range, is same as python2's xrange)
-import sys
-if sys.version_info < (3,):
-    range = xrange
-
 
 class UpstartIntegrationTests(UnityTestCase):
 
@@ -95,7 +89,7 @@
         self.addCleanup(ensure_stopped)
 
     def _set_proxy(self):
-        super(UpstartIntegrationTests, self)._set_proxy(
+        super()._set_proxy(
             get_proxy_object_for_existing_process(
                 pid=self.process.pid,
                 emulator_base=UnityEmulatorBase,))