Merge lp:autopilot into lp:autopilot/1.5

[Christopher Lee]

Flake8 fix for FTBFS due to new flake8.

Flake8 fix for FTBFS due to new flake8.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:570
http://jenkins.qa.ubuntu.com/job/autopilot-overlay-ci/2/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-overlay-vivid-amd64-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-overlay-vivid-amd64-ci/2/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-overlay-vivid-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-overlay-vivid-armhf-ci/2/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-overlay-vivid-i386-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-overlay-vivid-i386-ci/2/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3942/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3226/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3939
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3939/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22977

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-overlay-ci/2/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:570
http://jenkins.qa.ubuntu.com/job/autopilot-1.5-ci/40/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-1.5-wily-amd64-ci/14
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-1.5-wily-amd64-ci/14/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-1.5-wily-armhf-ci/14
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-1.5-wily-armhf-ci/14/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-1.5-wily-i386-ci/14
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-1.5-wily-i386-ci/14/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/633
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/365
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/633
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/633/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22980

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-1.5-ci/40/rebuild

review: Approve (continuous-integration)

=== modified file 'autopilot/input/__init__.py'
--- autopilot/input/__init__.py	2015-03-22 06:21:47 +0000
+++ autopilot/input/__init__.py	2015-09-02 03:31:08 +0000
@@ -129,7 +129,7 @@
         return _pick_backend(backends, preferred_backend)
 
     @contextmanager
-    def focused_type(self, input_target,  pointer=None):
+    def focused_type(self, input_target, pointer=None):
         """Type into an input widget.
 
         This context manager takes care of making sure a particular

=== modified file 'autopilot/run.py'
--- autopilot/run.py	2015-05-05 03:09:21 +0000
+++ autopilot/run.py	2015-09-02 03:31:08 +0000
@@ -214,7 +214,7 @@
 
 class _OneOrMoreArgumentStoreAction(Action):
 
-    def __call__(self,  parser, namespace, values, option_string=None):
+    def __call__(self, parser, namespace, values, option_string=None):
         if len(values) == 0:
             parser.error(
                 "Must specify at least one argument to the 'launch' command")

=== modified file 'autopilot/tests/functional/test_input_stack.py'
--- autopilot/tests/functional/test_input_stack.py	2015-07-19 23:25:07 +0000
+++ autopilot/tests/functional/test_input_stack.py	2015-09-02 03:31:08 +0000
@@ -1,3 +1,4 @@
+
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
 # Autopilot Functional Test Tool
@@ -189,9 +190,11 @@
             from autopilot.input import _uinput
             return _uinput.Keyboard._device._pressed_keys_ecodes
         else:
-            self.fail("Don't know how to get pressed keys list for backend "
-                      + self.backend
-                      )
+            self.fail(
+                "Don't know how to get pressed keys list for {}".format(
+                    self.backend
+                )
+            )
 
 
 @skipIf(platform.model() != "Desktop", "Only suitable on Desktop (WinMocker)")

=== modified file 'debian/rules'
--- debian/rules	2015-05-22 16:53:58 +0000
+++ debian/rules	2015-09-02 03:31:08 +0000
@@ -12,7 +12,7 @@
 	-dh_sphinxdoc
 
 override_dh_auto_build:
-	python3 -m flake8.run .
+	python3 -m flake8.run --ignore=E731,E226,W503 .
 	dh_auto_build
 	python3 setup.py build_sphinx -b html
 	python3 setup.py build_sphinx -b json

=== modified file 'setup.py'
--- setup.py	2014-05-15 05:59:11 +0000
+++ setup.py	2015-09-02 03:31:08 +0000
@@ -17,12 +17,11 @@
 # 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 setuptools import find_packages, setup, Extension
 
 import sys
 assert sys.version_info >= (3,), 'Python 3 is required'
 
-from setuptools import find_packages, setup, Extension
-
 
 VERSION = '1.5.0'