Merge lp:~veebers/autopilot/fixing-extension-classes-and-test into lp:autopilot

Proposed by Christopher Lee on 2015-01-20
Status: Merged
Merged at revision: 521
Proposed branch: lp:~veebers/autopilot/fixing-extension-classes-and-test
Merge into: lp:autopilot
Prerequisite: lp:~canonical-platform-qa/autopilot/fix1411096-update_desktop
Diff against target: 12 lines (+3/-0)
1 file modified
autopilot/introspection/_object_registry.py (+3/-0)
To merge this branch: bzr merge lp:~veebers/autopilot/fixing-extension-classes-and-test
Reviewer Review Type Date Requested Status
Christopher Lee (community) Approve on 2015-01-20
Leo Arias 2015-01-20 Pending
PS Jenkins bot continuous-integration 2015-01-20 Pending
Review via email: mp+246962@code.launchpad.net

This proposal supersedes a proposal from 2015-01-19.

Description of the change

Ensure that extension base classes are included in a proxy class' __bases__.
Fixes failing test.

To post a comment you must log in.
Leo Arias (elopio) wrote : Posted in a previous version of this proposal

<elopio> veebers: the change makes sense as far as I can see. And the test passes here.

review: Approve
Christopher Lee (veebers) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'autopilot/introspection/_object_registry.py'
2--- autopilot/introspection/_object_registry.py 2014-08-01 03:08:38 +0000
3+++ autopilot/introspection/_object_registry.py 2015-01-20 01:12:08 +0000
4@@ -173,6 +173,9 @@
5 )
6 )
7 if len(possible_classes) == 1:
8+ extended_proxy_bases = _get_proxy_bases_for_id(object_id)
9+ if extended_proxy_bases:
10+ possible_classes[0].__bases__ = extended_proxy_bases
11 return possible_classes[0]
12 return None
13

Subscribers

People subscribed via source and target branches