← Back to branch summary

~zsombi/ubuntu-ui-toolkit/platform_menu

« back to all changes in this revision

Viewing changes to tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/__init__.py

  • Committer: Christian Dywan
  • Date: 2015-12-18 15:28:33 UTC
  • mfrom: (1783 staging)
  • mto: This revision was merged to the branch mainline in revision 1787.
  • Revision ID: christian.dywan@canonical.com-20151218152833-qk8et50txa2cdhv3
Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/staging

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/__init__.py
44
44
    'Toolbar',
45
45
    'ToolkitException',
46
46
    'UbuntuListView11',
 
47
    'UbuntuListView',
47
48
    'UbuntuUIToolkitCustomProxyObjectBase',
48
49
]
49
50
 
90
91
from ubuntuuitoolkit._custom_proxy_objects._textfield import TextField
91
92
from ubuntuuitoolkit._custom_proxy_objects._toolbar import Toolbar
92
93
from ubuntuuitoolkit._custom_proxy_objects._ubuntulistview import (
93
 
    UbuntuListView11
 
94
    UbuntuListView11,
 
95
    UbuntuListView,
94
96
)