Merge lp:~barry/autopilot/lp1488175 into lp:autopilot

[Barry Warsaw]

My take on fixing the flake8 failures.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:519
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~barry/autopilot/lp1488175/+merge/268967/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/autopilot-ci/1133/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-wily-amd64-ci/63/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-wily-armhf-ci/62/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-wily-i386-ci/63/console

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

review: Needs Fixing (continuous-integration)

[Max Brustkern (nuclearbob)]

I have a couple of questions, but other than the merge conflicts, most of it looks great.

[Barry Warsaw (barry)]

On Aug 27, 2015, at 08:22 PM, Max Brustkern wrote:

>> @@ -39,8 +40,7 @@
>> """Must return a backend when called with a single backend."""
>> class Backend(object):
>> pass
>> - _create_backend = lambda: Backend()
>> - backend = _pick_backend(dict(foo=_create_backend), '')
>> + backend = _pick_backend(dict(foo=Backend), '')
>
>I'm not quite a clever in python as everyone else here, so I just want to
>make sure that Backend is wanted here and not Backend() This seems to apply
>to most of the tests around this, so I imagine they'd be breaking if it were
>incorrect, I just like to be sure it's intentional.

It is!

lambdas are defined here:

https://docs.python.org/3/reference/expressions.html#lambda

The example given provides a great way to think about them.

    lambda args: expression

is equivalent to

    def <lambda>(args):
        return expression

where the function is anonymous, i.e. it performs no name binding in the
current namespace. When you assign the `lambda: Backend()` to
_create_backend, it's the assignment that does the name binding to the
function object, so its exactly equivalent to:

    def _create_backend():
        return Backend()

Note too that when _pick_backend() is called, the code is passing in a
dictionary that maps the `foo` key to the *function object* created by the
lambda; specifically, the calling of the lambda-created function object is
deferred. It's exactly equivalent to just setting `foo` to the Backend
function object without calling it.

So in this case, the lambda is really just creating an unnecessary extra level
of call.

That's not quite the case where some of the lambdas take an argument, but you
can see how the translation to explicit function definitions should generally
go.

One thing to keep in mind about my translations. To be accurate, the
lambda-to-def conversion should return the value of the last expression, but I
don't do this in all cases because the tests appear to only care that an
exception is raised. Thus, the return values are mostly ignored. But for
correctness, you could return the values out of the locally defined
functions.

BTW, this equivalence is the reason why lambda are generally frowned upon.
They're almost never needed, and the savings in lines of code are usually not
worth the cost in readability or comprehension. It was probably the fans of
functional programming that tipped the balance against just removing them from
Python 3. ;)

>> === modified file 'setup.py'
>> --- setup.py 2015-08-19 00:25:00 +0000
>> +++ setup.py 2015-08-24 19:50:50 +0000
>> @@ -20,9 +20,16 @@
>> from setuptools import find_packages, setup, Extension
>>
>> import sys
>> +
>> +from setuptools import find_packages, setup, Extension
>
>It surprises me that these are needed and haven't been included
>previously. Was there something causing static analysis to not pick this up
>before?

Oh, that's weird. I don't remember adding that. Maybe it's a merge snafu?

P.S. you can play with this to see the equivalence in action:

def runme(func):
    print(func())

def hey():
    return 'hey'

yo = lambda: hey()

def sup():
    return hey()

run...

[Max Brustkern (nuclearbob)]

> On Aug 27, 2015, at 08:22 PM, Max Brustkern wrote:
>
> >> @@ -39,8 +40,7 @@
> >> """Must return a backend when called with a single backend."""
> >> class Backend(object):
> >> pass
> >> - _create_backend = lambda: Backend()
> >> - backend = _pick_backend(dict(foo=_create_backend), '')
> >> + backend = _pick_backend(dict(foo=Backend), '')
> >
> >I'm not quite a clever in python as everyone else here, so I just want to
> >make sure that Backend is wanted here and not Backend() This seems to apply
> >to most of the tests around this, so I imagine they'd be breaking if it were
> >incorrect, I just like to be sure it's intentional.
>
> It is!
>
> lambdas are defined here:
>
> https://docs.python.org/3/reference/expressions.html#lambda
>
> The example given provides a great way to think about them.
>
> lambda args: expression
>
> is equivalent to
>
> def <lambda>(args):
> return expression
>
> where the function is anonymous, i.e. it performs no name binding in the
> current namespace. When you assign the `lambda: Backend()` to
> _create_backend, it's the assignment that does the name binding to the
> function object, so its exactly equivalent to:
>
> def _create_backend():
> return Backend()
>
> Note too that when _pick_backend() is called, the code is passing in a
> dictionary that maps the `foo` key to the *function object* created by the
> lambda; specifically, the calling of the lambda-created function object is
> deferred. It's exactly equivalent to just setting `foo` to the Backend
> function object without calling it.

Yeah, that's what was confusing me. I saw:
_create_backend = lambda: Backend()
and assumed that would return Backend() (the return value of that, i.e. an instance of the class) and not Backend (the class itself) The rest of the lambda syntax made sense to me, I just tripped over some parentheses here, since we're setting foo=Backend and not foo=Backend() like I would have expected from the lambda. Exciting stuff!

Unmerged revisions

519. By Barry Warsaw on 2015-08-24

A few more flake8 fixes.

518. By Barry Warsaw on 2015-08-24

Mass fix for LP: #1488175

=== modified file 'autopilot/introspection/_xpathselect.py'
--- autopilot/introspection/_xpathselect.py	2014-05-23 13:26:00 +0000
+++ autopilot/introspection/_xpathselect.py	2015-08-24 19:50:50 +0000
@@ -102,10 +102,7 @@
             raise TypeError(
                 "'operation' parameter must be bytes, not '%s'"
                 % type(operation).__name__)
-        if (
-            parent
-            and parent.needs_client_side_filtering()
-        ):
+        if parent and parent.needs_client_side_filtering():
             raise InvalidXPathQuery(
                 "Cannot create a new query from a parent that requires "
                 "client-side filter processing."
@@ -137,9 +134,9 @@
             k: v for k, v in filters.items() if k not in self._server_filters
         }
         if (
-            operation == Query.Operation.DESCENDANT
-            and query == Query.WILDCARD
-            and not self._server_filters
+            operation == Query.Operation.DESCENDANT and
+            query == Query.WILDCARD and
+            not self._server_filters
         ):
             raise InvalidXPathQuery(
                 "Must provide at least one server-side filter when searching "

=== modified file 'autopilot/process/_bamf.py'
--- autopilot/process/_bamf.py	2014-07-23 03:37:24 +0000
+++ autopilot/process/_bamf.py	2015-08-24 19:50:50 +0000
@@ -167,8 +167,10 @@
             try:
                 new_windows = []
                 [new_windows.extend(a.get_windows()) for a in apps]
-                filter_fn = lambda w: w.x_id not in [
-                    c.x_id for c in existing_windows]
+
+                def filter_fn(w):
+                    return w.x_id not in [c.x_id for c in existing_windows]
+
                 new_wins = list(filter(filter_fn, new_windows))
                 if new_wins:
                     assert len(new_wins) == 1

=== modified file 'autopilot/run.py'
--- autopilot/run.py	2015-08-19 00:25:00 +0000
+++ autopilot/run.py	2015-08-24 19:50:50 +0000
@@ -355,8 +355,8 @@
 
 def _is_testing_autopilot_module(test_names):
     return (
-        os.path.basename(sys.argv[0]) == 'autopilot'
-        and any(t.startswith('autopilot') for t in test_names)
+        os.path.basename(sys.argv[0]) == 'autopilot' and
+        any(t.startswith('autopilot') for t in test_names)
     )
 
 
@@ -712,23 +712,23 @@
         )
 
         if self.args.run_order:
-            test_list_fn = lambda: iterate_tests(test_suite)
+            test_list = list(iterate_tests(test_suite))
         else:
-            test_list_fn = lambda: sorted(iterate_tests(test_suite), key=id)
+            test_list = list(sorted(iterate_tests(test_suite), key=id))
 
         # only show test suites, not test cases. TODO: Check if this is still
         # a requirement.
         if self.args.suites:
             suite_names = ["%s.%s" % (t.__module__, t.__class__.__name__)
-                           for t in test_list_fn()]
+                           for t in test_list]
             unique_suite_names = list(OrderedDict.fromkeys(suite_names).keys())
             num_tests = len(unique_suite_names)
             total_title = "suites"
             print("    %s" % ("\n    ".join(unique_suite_names)))
         else:
-            for test in test_list_fn():
-                has_scenarios = (hasattr(test, "scenarios")
-                                 and type(test.scenarios) is list)
+            for test in test_list:
+                has_scenarios = (hasattr(test, "scenarios") and
+                                 type(test.scenarios) is list)
                 if has_scenarios:
                     num_tests += len(test.scenarios)
                     print(" *%d %s" % (len(test.scenarios), test.id()))

=== modified file 'autopilot/testcase.py'
--- autopilot/testcase.py	2015-08-19 03:34:47 +0000
+++ autopilot/testcase.py	2015-08-24 19:50:50 +0000
@@ -547,6 +547,6 @@
 
 def _considered_failing_test(failure_class_type):
     return (
-        not issubclass(failure_class_type, SkipTest)
-        and not issubclass(failure_class_type, _ExpectedFailure)
+        not issubclass(failure_class_type, SkipTest) and
+        not issubclass(failure_class_type, _ExpectedFailure)
     )

=== modified file 'autopilot/tests/functional/test_ap_apps.py'
--- autopilot/tests/functional/test_ap_apps.py	2015-01-26 01:59:18 +0000
+++ autopilot/tests/functional/test_ap_apps.py	2015-08-24 19:50:50 +0000
@@ -31,6 +31,7 @@
     Raises,
     raises,
 )
+from functools import partial
 from textwrap import dedent
 
 from fixtures import EnvironmentVariable
@@ -348,7 +349,7 @@
             time.sleep(1)
             os.abort()
             """))
-        launch_fn = lambda: self.launch_test_application(path, app_type='qt')
+        launch_fn = partial(self.launch_test_application, path, app_type='qt')
         self.assertThat(launch_fn, raises(ProcessSearchError))
 
     @skipIf(model() != "Desktop", "Only suitable on Desktop (Qt4)")

=== modified file 'autopilot/tests/functional/test_autopilot_functional.py'
--- autopilot/tests/functional/test_autopilot_functional.py	2015-05-01 02:29:02 +0000
+++ autopilot/tests/functional/test_autopilot_functional.py	2015-08-24 19:50:50 +0000
@@ -528,8 +528,10 @@
         with TempDir() as tmp_dir_fixture:
             dir_pattern = os.path.join(tmp_dir_fixture.path, 'rMD-session*')
             original_session_dirs = set(glob.glob(dir_pattern))
-            get_new_sessions = lambda: \
-                set(glob.glob(dir_pattern)) - original_session_dirs
+
+            def get_new_sessions():
+                return set(glob.glob(dir_pattern)) - original_session_dirs
+
             mock_test_case = Mock()
             mock_test_case.shortDescription.return_value = "Dummy_Description"
             logger = RMDVideoLogFixture(tmp_dir_fixture.path, mock_test_case)

=== modified file 'autopilot/tests/functional/test_dbus_query.py'
--- autopilot/tests/functional/test_dbus_query.py	2015-06-09 15:35:08 +0000
+++ autopilot/tests/functional/test_dbus_query.py	2015-08-24 19:50:50 +0000
@@ -22,6 +22,7 @@
 import os
 import subprocess
 import signal
+from functools import partial
 from timeit import default_timer
 from tempfile import mktemp
 from testtools import skipIf
@@ -140,12 +141,11 @@
 
     def test_select_single_no_name_no_parameter_raises_exception(self):
         app = self.start_fully_featured_app()
-        fn = lambda: app.select_single()
-        self.assertThat(fn, raises(ValueError))
+        self.assertThat(app.select_single, raises(ValueError))
 
     def test_select_single_no_match_raises_exception(self):
         app = self.start_fully_featured_app()
-        match_fn = lambda: app.select_single("QMadeupType")
+        match_fn = partial(app.select_single, "QMadeupType")
         self.assertThat(match_fn, raises(StateNotFoundError('QMadeupType')))
 
     def test_exception_raised_when_operating_on_dead_app(self):
@@ -174,7 +174,7 @@
 
     def test_select_single_parameters_no_match_raises_exception(self):
         app = self.start_fully_featured_app()
-        match_fn = lambda: app.select_single(title="Non-existant object")
+        match_fn = partial(app.select_single, title="Non-existant object")
         self.assertThat(
             match_fn,
             raises(StateNotFoundError('*', title="Non-existant object"))
@@ -182,13 +182,12 @@
 
     def test_select_single_returning_multiple_raises(self):
         app = self.start_fully_featured_app()
-        fn = lambda: app.select_single('QMenu')
+        fn = partial(app.select_single, 'QMenu')
         self.assertThat(fn, raises(ValueError))
 
     def test_select_many_no_name_no_parameter_raises_exception(self):
         app = self.start_fully_featured_app()
-        fn = lambda: app.select_single()
-        self.assertThat(fn, raises(ValueError))
+        self.assertThat(app.select_single, raises(ValueError))
 
     def test_select_many_only_using_parameters(self):
         app = self.start_fully_featured_app()
@@ -211,7 +210,7 @@
     def test_wait_select_single_fails_slowly(self):
         app = self.start_fully_featured_app()
         start_time = default_timer()
-        fn = lambda: app.wait_select_single('QMadeupType')
+        fn = partial(app.wait_select_single, 'QMadeupType')
         self.assertThat(fn, raises(StateNotFoundError('QMadeupType')))
         end_time = default_timer()
         self.assertThat(abs(end_time - start_time), GreaterThan(9))
@@ -234,8 +233,7 @@
         dbus_pid = int(results[1].split("=")[1])
         dbus_address = results[0].split("=", 1)[1]
 
-        kill_dbus = lambda pid: os.killpg(pid, signal.SIGTERM)
-        self.addCleanup(kill_dbus, dbus_pid)
+        self.addCleanup(os.killpg, dbus_pid, signal.SIGTERM)
 
         return dbus_address
 

=== modified file 'autopilot/tests/functional/test_input_stack.py'
--- autopilot/tests/functional/test_input_stack.py	2015-08-19 00:25:00 +0000
+++ autopilot/tests/functional/test_input_stack.py	2015-08-24 19:50:50 +0000
@@ -190,11 +190,17 @@
             from autopilot.input import _uinput
             return _uinput.Keyboard._device._pressed_keys_ecodes
         else:
+<<<<<<< TREE
             self.fail(
                 "Don't know how to get pressed keys list for {}".format(
                     self.backend
                 )
             )
+=======
+            self.fail("Don't know how to get pressed keys list for backend " +
+                      self.backend
+                      )
+>>>>>>> MERGE-SOURCE
 
 
 @skipIf(platform.model() != "Desktop", "Only suitable on Desktop (WinMocker)")
@@ -468,7 +474,9 @@
 
         app = self.start_qml_script(test_qml)
         pinch_widget = app.select_single("QQuickRectangle")
-        widget_bg_colour = lambda: pinch_widget.color
+
+        def widget_bg_colour():
+            return pinch_widget.color
 
         self.assertThat(widget_bg_colour, Eventually(Equals(start_green_bg)))
 

=== modified file 'autopilot/tests/unit/test_application_launcher.py'
--- autopilot/tests/unit/test_application_launcher.py	2014-07-22 02:30:19 +0000
+++ autopilot/tests/unit/test_application_launcher.py	2015-08-24 19:50:50 +0000
@@ -586,9 +586,9 @@
             )
 
     def test_check_error_raises_RuntimeError_on_timeout(self):
-        fn = lambda: UpstartApplicationLauncher._check_status_error(
-            UpstartApplicationLauncher.Timeout
-        )
+        def fn():
+            UpstartApplicationLauncher._check_status_error(
+                UpstartApplicationLauncher.Timeout)
         self.assertThat(
             fn,
             raises(
@@ -599,9 +599,9 @@
         )
 
     def test_check_error_raises_RuntimeError_on_failure(self):
-        fn = lambda: UpstartApplicationLauncher._check_status_error(
-            UpstartApplicationLauncher.Failed
-        )
+        def fn():
+            UpstartApplicationLauncher._check_status_error(
+                UpstartApplicationLauncher.Failed)
         self.assertThat(
             fn,
             raises(
@@ -612,10 +612,11 @@
         )
 
     def test_check_error_raises_RuntimeError_with_extra_message(self):
-        fn = lambda: UpstartApplicationLauncher._check_status_error(
-            UpstartApplicationLauncher.Failed,
-            "extra message"
-        )
+        def fn():
+            UpstartApplicationLauncher._check_status_error(
+                UpstartApplicationLauncher.Failed,
+                "extra message"
+                )
         self.assertThat(
             fn,
             raises(

=== modified file 'autopilot/tests/unit/test_input.py'
--- autopilot/tests/unit/test_input.py	2015-07-07 22:50:24 +0000
+++ autopilot/tests/unit/test_input.py	2015-08-24 19:50:50 +0000
@@ -57,7 +57,10 @@
 
     def test_get_center_point_raises_ValueError_on_empty_object(self):
         obj = make_fake_object()
-        fn = lambda: get_center_point(obj)
+
+        def fn():
+            get_center_point(obj)
+
         expected_exception = ValueError(
             "Object '%r' does not have any recognised position attributes" %
             obj)

=== modified file 'autopilot/tests/unit/test_introspection_dbus.py'
--- autopilot/tests/unit/test_introspection_dbus.py	2015-05-20 20:13:30 +0000
+++ autopilot/tests/unit/test_introspection_dbus.py	2015-08-24 19:50:50 +0000
@@ -185,7 +185,10 @@
 
         with patch.object(fake_object, 'get_children', return_value=[child]):
             out = StringIO()
-            print_func = lambda: fake_object.print_tree(out)
+
+            def print_func():
+                fake_object.print_tree(out)
+
             self.assertThat(print_func, Not(Raises(StateNotFoundError)))
             self.assertEqual(out.getvalue(), dedent("""\
             == /some/path ==

=== modified file 'autopilot/tests/unit/test_introspection_xpathselect.py'
--- autopilot/tests/unit/test_introspection_xpathselect.py	2014-05-23 13:30:10 +0000
+++ autopilot/tests/unit/test_introspection_xpathselect.py	2015-08-24 19:50:50 +0000
@@ -28,11 +28,12 @@
 class XPathSelectQueryTests(TestCase):
 
     def test_query_raises_TypeError_on_non_bytes_query(self):
-        fn = lambda: xpathselect.Query(
-            None,
-            xpathselect.Query.Operation.CHILD,
-            'asd'
-        )
+        def fn():
+            xpathselect.Query(
+                None,
+                xpathselect.Query.Operation.CHILD,
+                'asd'
+            )
         self.assertThat(
             fn,
             raises(
@@ -151,7 +152,10 @@
     def test_deriving_from_client_side_filtered_query_raises_ValueError(self):
         q = xpathselect.Query.root("Foo") \
             .select_descendant("Baz", dict(name="\u2026"))
-        fn = lambda: q.select_child("Foo")
+
+        def fn():
+            q.select_child("Foo")
+
         self.assertThat(
             fn,
             raises(InvalidXPathQuery(
@@ -161,7 +165,8 @@
         )
 
     def test_init_raises_TypeError_on_invalid_operation_type(self):
-        fn = lambda: xpathselect.Query(None, '/', b'sdf')
+        def fn():
+            xpathselect.Query(None, '/', b'sdf')
         self.assertThat(
             fn,
             raises(TypeError(
@@ -171,14 +176,16 @@
         )
 
     def test_init_raises_ValueError_on_invalid_operation(self):
-        fn = lambda: xpathselect.Query(None, b'foo', b'sdf')
+        def fn():
+            xpathselect.Query(None, b'foo', b'sdf')
         self.assertThat(
             fn,
             raises(InvalidXPathQuery("Invalid operation 'foo'."))
         )
 
     def test_init_raises_ValueError_on_invalid_descendant_search(self):
-        fn = lambda: xpathselect.Query(None, b'//', b'*')
+        def fn():
+            xpathselect.Query(None, b'//', b'*')
         self.assertThat(
             fn,
             raises(InvalidXPathQuery(
@@ -188,7 +195,8 @@
         )
 
     def test_new_from_path_and_id_raises_TypeError_on_unicode_path(self):
-        fn = lambda: xpathselect.Query.new_from_path_and_id('bad_path', 42)
+        def fn():
+            xpathselect.Query.new_from_path_and_id('bad_path', 42)
         self.assertThat(
             fn,
             raises(TypeError(
@@ -197,14 +205,16 @@
         )
 
     def test_new_from_path_and_id_raises_ValueError_on_invalid_path(self):
-        fn = lambda: xpathselect.Query.new_from_path_and_id(b'bad_path', 42)
+        def fn():
+            xpathselect.Query.new_from_path_and_id(b'bad_path', 42)
         self.assertThat(
             fn,
             raises(InvalidXPathQuery("Invalid path 'bad_path'."))
         )
 
     def test_new_from_path_and_id_raises_ValueError_on_invalid_path2(self):
-        fn = lambda: xpathselect.Query.new_from_path_and_id(b'/', 42)
+        def fn():
+            xpathselect.Query.new_from_path_and_id(b'/', 42)
         self.assertThat(
             fn,
             raises(InvalidXPathQuery("Invalid path '/'."))
@@ -238,7 +248,8 @@
         self.assertEqual(b'/root/child[id=42]/..', q2.server_query_bytes())
 
     def test_init_raises_ValueError_when_passing_filters_and_parent(self):
-        fn = lambda: xpathselect.Query(None, b'/', b'..', dict(foo=123))
+        def fn():
+            xpathselect.Query(None, b'/', b'..', dict(foo=123))
         self.assertThat(
             fn,
             raises(InvalidXPathQuery(
@@ -247,7 +258,8 @@
         )
 
     def test_init_raises_ValueError_when_passing_bad_op_and_parent(self):
-        fn = lambda: xpathselect.Query(None, b'//', b'..')
+        def fn():
+            xpathselect.Query(None, b'//', b'..')
         self.assertThat(
             fn,
             raises(InvalidXPathQuery(
@@ -260,7 +272,8 @@
         self.assertEqual(b'/', q.server_query_bytes())
 
     def test_cannot_select_child_on_pseudo_tree_root(self):
-        fn = lambda: xpathselect.Query.pseudo_tree_root().select_child('foo')
+        def fn():
+            xpathselect.Query.pseudo_tree_root().select_child('foo')
         self.assertThat(
             fn,
             raises(InvalidXPathQuery(
@@ -311,10 +324,11 @@
 class ParameterFilterStringTests(TestWithScenarios, TestCase):
 
     def test_raises_ValueError_on_unknown_type(self):
-        fn = lambda: xpathselect._get_filter_string_for_key_value_pair(
-            'k',
-            object()
-        )
+        def fn():
+            xpathselect._get_filter_string_for_key_value_pair(
+                'k',
+                object()
+            )
         self.assertThat(
             fn,
             raises(

=== modified file 'autopilot/tests/unit/test_pick_backend.py'
--- autopilot/tests/unit/test_pick_backend.py	2014-02-10 03:14:40 +0000
+++ autopilot/tests/unit/test_pick_backend.py	2015-08-24 19:50:50 +0000
@@ -31,7 +31,8 @@
 
     def test_raises_runtime_error_on_empty_backends(self):
         """Must raise a RuntimeError when we pass no backends."""
-        fn = lambda: _pick_backend({}, '')
+        def fn():
+            _pick_backend({}, '')
         self.assertThat(
             fn, raises(RuntimeError("Unable to instantiate any backends\n")))
 
@@ -39,8 +40,7 @@
         """Must return a backend when called with a single backend."""
         class Backend(object):
             pass
-        _create_backend = lambda: Backend()
-        backend = _pick_backend(dict(foo=_create_backend), '')
+        backend = _pick_backend(dict(foo=Backend), '')
         self.assertThat(backend, IsInstance(Backend))
 
     def test_first_backend(self):
@@ -51,8 +51,8 @@
         class Backend2(object):
             pass
         backend_dict = OrderedDict()
-        backend_dict['be1'] = lambda: Backend1()
-        backend_dict['be2'] = lambda: Backend2()
+        backend_dict['be1'] = Backend1
+        backend_dict['be2'] = Backend2
 
         backend = _pick_backend(backend_dict, '')
         self.assertThat(backend, IsInstance(Backend1))
@@ -66,8 +66,8 @@
         class Backend2(object):
             pass
         backend_dict = OrderedDict()
-        backend_dict['be1'] = lambda: Backend1()
-        backend_dict['be2'] = lambda: Backend2()
+        backend_dict['be1'] = Backend1
+        backend_dict['be2'] = Backend2
 
         backend = _pick_backend(backend_dict, 'be2')
         self.assertThat(backend, IsInstance(Backend2))
@@ -82,18 +82,20 @@
             def __init__(self):
                 raise ValueError("Foo")
         backend_dict = OrderedDict()
-        backend_dict['be1'] = lambda: Backend1()
-        backend_dict['be2'] = lambda: Backend2()
+        backend_dict['be1'] = Backend1
+        backend_dict['be2'] = Backend2
 
-        fn = lambda: _pick_backend(backend_dict, 'be2')
+        def fn():
+            _pick_backend(backend_dict, 'be2')
         self.assertThat(fn, raises(BackendException))
 
     def test_raises_RuntimeError_on_invalid_preferred_backend(self):
         """Must raise RuntimeError when we pass a backend that's not there"""
         class Backend(object):
             pass
-        _create_backend = lambda: Backend()
-        fn = lambda: _pick_backend(dict(foo=_create_backend), 'bar')
+
+        def fn():
+            return _pick_backend(dict(foo=Backend), 'bar')
 
         self.assertThat(
             fn,
@@ -109,8 +111,8 @@
             def __init__(self):
                 raise ValueError("Foo")
         backend_dict = OrderedDict()
-        backend_dict['be1'] = lambda: Backend1()
-        backend_dict['be2'] = lambda: Backend2()
+        backend_dict['be1'] = Backend1
+        backend_dict['be2'] = Backend2
 
         raised = False
         try:
@@ -128,10 +130,11 @@
             def __init__(self):
                 raise ValueError("Foo")
         backend_dict = OrderedDict()
-        backend_dict['be1'] = lambda: BadBackend()
-        backend_dict['be2'] = lambda: BadBackend()
+        backend_dict['be1'] = BadBackend
+        backend_dict['be2'] = BadBackend
 
-        fn = lambda: _pick_backend(backend_dict, '')
+        def fn():
+            return _pick_backend(backend_dict, '')
         expected_exception = RuntimeError(dedent("""\
             Unable to instantiate any backends
             be1: ValueError('Foo',)

=== modified file 'autopilot/tests/unit/test_platform.py'
--- autopilot/tests/unit/test_platform.py	2014-07-23 03:37:24 +0000
+++ autopilot/tests/unit/test_platform.py	2015-08-24 19:50:50 +0000
@@ -68,7 +68,8 @@
 class PlatformGetProcessNameTests(TestCase):
 
     def test_returns_callable_value(self):
-        test_callable = lambda: "foo"
+        def test_callable():
+            return "foo"
         self.assertEqual("foo", platform._get_process_name(test_callable))
 
     def test_returns_string(self):

=== modified file 'autopilot/tests/unit/test_process.py'
--- autopilot/tests/unit/test_process.py	2014-05-20 08:53:21 +0000
+++ autopilot/tests/unit/test_process.py	2015-08-24 19:50:50 +0000
@@ -44,8 +44,8 @@
             process.launch_uris_as_manager.called_once_with(
                 [],
                 None,
-                GLib.SpawnFlags.SEARCH_PATH
-                | GLib.SpawnFlags.STDOUT_TO_DEV_NULL,
+                GLib.SpawnFlags.SEARCH_PATH |
+                GLib.SpawnFlags.STDOUT_TO_DEV_NULL,
                 None,
                 None,
                 None,

=== modified file 'autopilot/tests/unit/test_stagnate_state.py'
--- autopilot/tests/unit/test_stagnate_state.py	2013-09-04 03:44:07 +0000
+++ autopilot/tests/unit/test_stagnate_state.py	2015-08-24 19:50:50 +0000
@@ -41,7 +41,8 @@
         x, y = (1, 1)
         state_check.check_state(x, y)
 
-        fn = lambda: state_check.check_state(x, y)
+        def fn():
+            state_check.check_state(x, y)
         self.assertThat(
             fn,
             raises(
@@ -52,7 +53,8 @@
         )
 
     def test_raises_exception_when_thresold_is_zero(self):
-        fn = lambda: StagnantStateDetector(threshold=0)
+        def fn():
+            StagnantStateDetector(threshold=0)
         self.assertThat(
             fn,
             raises(ValueError("Threshold must be a positive integer."))
@@ -64,5 +66,6 @@
         no_hash = UnHashable()
         state_check = StagnantStateDetector(threshold=5)
 
-        fn = lambda: state_check.check_state(no_hash)
+        def fn():
+            state_check.check_state(no_hash)
         self.assertThat(fn, raises(TypeError("unhashable type: 'UnHashable'")))

=== modified file 'autopilot/tests/unit/test_test_loader.py'
--- autopilot/tests/unit/test_test_loader.py	2014-05-20 08:53:21 +0000
+++ autopilot/tests/unit/test_test_loader.py	2015-08-24 19:50:50 +0000
@@ -57,9 +57,10 @@
         self.test_module_name = self._unique_module_name()
 
     def _unique_module_name(self):
-        generator = lambda: ''.join(
-            random.choice(string.ascii_letters) for letter in range(8)
-        )
+        def generator():
+            return ''.join(
+                random.choice(string.ascii_letters) for letter in range(8)
+            )
         name = generator()
         while name in self._previous_module_names:
             name = generator()

=== modified file 'autopilot/tests/unit/test_testcase.py'
--- autopilot/tests/unit/test_testcase.py	2014-07-29 01:47:19 +0000
+++ autopilot/tests/unit/test_testcase.py	2015-08-24 19:50:50 +0000
@@ -39,10 +39,11 @@
 
     def test_snapshot_raises_AssertionError_with_new_apps_opened(self):
         with sleep.mocked():
-            fn = lambda: _compare_system_with_process_snapshot(
-                lambda: ['foo'],
-                []
-            )
+            def fn():
+                return _compare_system_with_process_snapshot(
+                    lambda: ['foo'],
+                    []
+                )
             self.assertThat(fn, raises(AssertionError(
                 "The following apps were started during the test and "
                 "not closed: ['foo']"

=== modified file 'autopilot/tests/unit/test_types.py'
--- autopilot/tests/unit/test_types.py	2014-10-30 02:06:55 +0000
+++ autopilot/tests/unit/test_types.py	2015-08-24 19:50:50 +0000
@@ -677,7 +677,8 @@
             ]
         )
 
-        fn = lambda: create_value_instance(data, None, None)
+        def fn():
+            return create_value_instance(data, None, None)
 
         self.assertThat(fn, raises(
             ValueError("Rectangle must be constructed with 4 arguments, not 1")
@@ -706,7 +707,8 @@
             ]
         )
 
-        fn = lambda: create_value_instance(data, None, None)
+        def fn():
+            return create_value_instance(data, None, None)
 
         self.assertThat(fn, raises(
             ValueError("Color must be constructed with 4 arguments, not 1")
@@ -735,7 +737,8 @@
             ]
         )
 
-        fn = lambda: create_value_instance(data, None, None)
+        def fn():
+            create_value_instance(data, None, None)
 
         self.assertThat(fn, raises(
             ValueError("Point must be constructed with 2 arguments, not 3")
@@ -762,7 +765,8 @@
             ]
         )
 
-        fn = lambda: create_value_instance(data, None, None)
+        def fn():
+            return create_value_instance(data, None, None)
 
         self.assertThat(fn, raises(
             ValueError("Size must be constructed with 2 arguments, not 1")
@@ -790,7 +794,8 @@
             ]
         )
 
-        fn = lambda: create_value_instance(data, None, None)
+        def fn():
+            return create_value_instance(data, None, None)
 
         self.assertThat(fn, raises(
             ValueError("DateTime must be constructed with 1 arguments, not 3")
@@ -821,7 +826,8 @@
             ]
         )
 
-        fn = lambda: create_value_instance(data, None, None)
+        def fn():
+            return create_value_instance(data, None, None)
 
         self.assertThat(fn, raises(
             ValueError("Time must be constructed with 4 arguments, not 3")
@@ -852,7 +858,9 @@
                 dbus.Int32(0),
             ]
         )
-        fn = lambda: create_value_instance(data, None, None)
+
+        def fn():
+            return create_value_instance(data, None, None)
 
         self.assertThat(fn, raises(
             ValueError("Cannot create attribute, no data supplied")
@@ -881,7 +889,8 @@
             ]
         )
 
-        fn = lambda: create_value_instance(data, None, None)
+        def fn():
+            return create_value_instance(data, None, None)
 
         self.assertThat(fn, raises(
             ValueError("Point3D must be constructed with 3 arguments, not 2")

=== modified file 'autopilot/vis/dbus_search.py'
--- autopilot/vis/dbus_search.py	2014-04-10 21:39:39 +0000
+++ autopilot/vis/dbus_search.py	2015-08-24 19:50:50 +0000
@@ -43,12 +43,16 @@
         constructed from the provided bus, connection and object name.
 
         """
-        handler = lambda xml: self._xml_processor(
-            conn_name,
-            obj_name,
-            xml
-        )
-        error_handler = lambda *args: _logger.error("Error occured: %r" % args)
+        def handler(xml):
+            return self._xml_processor(
+                conn_name,
+                obj_name,
+                xml
+            )
+
+        def error_handler(*args):
+            return _logger.error("Error occured: %r" % args)
+
         obj = self._bus.get_object(conn_name, obj_name)
 
         # avoid introspecting our own PID, as that locks up with libdbus

=== modified file 'debian/changelog'
--- debian/changelog	2015-05-08 04:45:01 +0000
+++ debian/changelog	2015-08-24 19:50:50 +0000
@@ -1,12 +1,80 @@
-autopilot (1.5.0) UNRELEASED; urgency=medium
-
+autopilot (1.5.1+15.10.20150723-0ubuntu1) wily; urgency=medium
+
+  [ Christopher Lee ]
+  * Bug fixes including updated dependencies.
+
+  [ Ken VanDine ]
+  * Bug fixes including updated dependencies.
+
+ -- CI Train Bot <[e-mail]>  Thu, 23 Jul 2015 14:39:21 +0000
+
+autopilot (1.5.1+15.10.20150716-0ubuntu1) wily; urgency=medium
+
+  [ Christopher Lee ]
+  * Add window manager support for autopilot sandbox run, fixes LP:1379508
+  * Add fixture that forces a gsetting for unity8 so that OSK is shown even
+    when a UInput keyboard is present.
+  * Fix unit test failures on Wily
+
+ -- CI Train Bot <[e-mail]>  Thu, 16 Jul 2015 04:38:49 +0000
+
+autopilot (1.5.1+15.04.20150708-0ubuntu1) vivid; urgency=medium
+
+  [ Christopher Lee ]
+  * Create correct touch device at creation to stop unity8 erroneously
+    changing to windowed mode. (Fixes lp:1471598).
+
+ -- CI Train Bot <[e-mail]>  Wed, 08 Jul 2015 03:44:43 +0000
+
+autopilot (1.5.1+15.04.20150522-0ubuntu1) vivid; urgency=medium
+
+  [ CI Train Bot ]
+  * New rebuild forced.
+
+  [ Christopher Lee, Federico Gimenez, Leo Arias, Richard Huddie, Vincent Ladeuil ]
+  * Bug fixes for logging (debug level now -vv) and application of CPO
+    bases for proxy objects. (LP: #1425721, #1376996, #1420949)
+
+ -- CI Train Bot <[e-mail]>  Fri, 22 May 2015 16:54:03 +0000
+
+autopilot (1.5.0+15.04.20150408-0ubuntu1) vivid; urgency=medium
+
+  [ Albert Astals Cid ]
+  * Bug fixes related to improving automated runs.
+
+  [ Christopher Lee ]
+  * Bug fixes related to improving automated runs.
+
+ -- CI Train Bot <[e-mail]>  Wed, 08 Apr 2015 15:07:28 +0000
+
+autopilot (1.5.0+15.04.20150323-0ubuntu1) vivid; urgency=medium
+
+  [ CI Train Bot ]
+  * New rebuild forced.
+
+  [ Christopher Lee ]
+  * Bugfix for Touch pointer pressed. Packaging req. due to python3-xlib
+    bug.
+
+  [ Leo Arias ]
+  * Bugfix for Touch pointer pressed. Packaging req. due to python3-xlib
+    bug.
+
+ -- CI Train Bot <[e-mail]>  Mon, 23 Mar 2015 09:34:31 +0000
+
+autopilot (1.5.0+15.04.20150226.1-0ubuntu1) vivid; urgency=medium
+
+  [ Christopher Lee ]
   * Fix for desktop file name change (lp:1411096)
     Fix for config value containing '=' char (lp:1408317)
     Fix for skipped tests not appearing in log (lp:1414632)
     Add json docs build (for web publish) (lp:1409778)
     Documentation improvements for API, Tutorial, FAQ, and Guidelines
 
- -- Christopher Lee <[e-mail]>  Fri, 27 Feb 2015 10:16:42 +1300
+  [ CI Train Bot ]
+  * New rebuild forced.
+
+ -- CI Train Bot <[e-mail]>  Thu, 26 Feb 2015 22:47:35 +0000
 
 autopilot (1.5.0+15.04.20141031-0ubuntu1) vivid; urgency=low
 
@@ -131,7 +199,7 @@
   * Remove python2 packages and dependencies, as they're now handled by the
     autopilot-legacy source package. (lp: #1308661)
   * Autopilot vis tool can now search the introspection tree. (lp: #1097392)
-  * Autopilot vis tool can now draw a transparent overlay over the selected 
+  * Autopilot vis tool can now draw a transparent overlay over the selected
     widget.
   * Autopilot vis tool now shows the root of the introspection tree (lp: #1298600)
   * Autopilot vis tool can now be launched from the unity dash.
@@ -265,7 +333,7 @@
 
 autopilot (1.4+14.04.20140310.1-0ubuntu1) trusty; urgency=low
 
-  * 
+  *
 
  -- Ubuntu daily release <[e-mail]>  Mon, 10 Mar 2014 19:39:00 +0000
 

=== modified file 'docs/otto.py'
--- docs/otto.py	2013-07-25 05:47:36 +0000
+++ docs/otto.py	2015-08-24 19:50:50 +0000
@@ -59,9 +59,6 @@
         image_container.children.append(nodes.image(uri='/images/otto-64.png'))
         image_container['classes'] = ['otto-image-container']
         outer_container = nodes.container()
-        outer_container.children.extend(
-            [image_container]
-            + ad
-        )
+        outer_container.children.extend([image_container] + ad)
         outer_container['classes'] = ['otto-says-container']
         return [outer_container]

=== modified file 'setup.py'
--- setup.py	2015-08-19 00:25:00 +0000
+++ setup.py	2015-08-24 19:50:50 +0000
@@ -20,9 +20,16 @@
 from setuptools import find_packages, setup, Extension
 
 import sys
+
+from setuptools import find_packages, setup, Extension
+
+
 assert sys.version_info >= (3,), 'Python 3 is required'
-
-
+<<<<<<< TREE
+
+
+=======
+>>>>>>> MERGE-SOURCE
 VERSION = '1.5.0'