Ubuntu UI Toolkit

Merge lp:~ken-vandine/ubuntu-ui-toolkit/staging-lp1451243 into lp:ubuntu-ui-toolkit/staging

  1. staging-lp1451243
  2. Merge into staging
Proposed by Ken VanDine
Status: Merged
Approved by: Tim Peeters
Approved revision: 1596
Merged at revision: 1596
Proposed branch: lp:~ken-vandine/ubuntu-ui-toolkit/staging-lp1451243
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 15 lines (+5/-0)
1 file modified
tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_mainview.py (+5/-0)
To merge this branch: bzr merge lp:~ken-vandine/ubuntu-ui-toolkit/staging-lp1451243
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Tim Peeters Approve
Review via email: mp+267513@code.launchpad.net

Commit message

Don't fail if MainView doesn't have a useDeprecatedToolbar property

Description of the change

Don't fail if MainView doesn't have a useDeprecatedToolbar property

To post a comment you must log in.
Revision history for this message
Tim Peeters (tpeeters) wrote :

thanks!

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_mainview.py'
2--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_mainview.py 2015-04-14 21:02:06 +0000
3+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_mainview.py 2015-08-10 13:08:58 +0000
4@@ -40,6 +40,11 @@
5 class MainView(_common.UbuntuUIToolkitCustomProxyObjectBase):
6 """MainView Autopilot custom proxy object."""
7
8+ def __init__(self, *args):
9+ super().__init__(*args)
10+ if not hasattr(self, 'useDeprecatedToolbar'):
11+ self.useDeprecatedToolbar = None
12+
13 @classmethod
14 def validate_dbus_object(cls, path, state):
15 if super().validate_dbus_object(path, state):

Subscribers

People subscribed via source and target branches