Ubuntu One Control Panel

Merge lp://qastaging/~dobey/ubuntuone-control-panel/lint-roller into lp://qastaging/ubuntuone-control-panel

lint-roller
Merge into trunk

Proposed by dobey on 2012-10-23

Status:

Merged

Approved by:

dobey on 2012-10-26

Approved revision:

374

Merged at revision:

372

Proposed branch:

lp://qastaging/~dobey/ubuntuone-control-panel/lint-roller

Merge into:

lp://qastaging/ubuntuone-control-panel

Diff against target:

257 lines (+29/-34)

12 files modified

run-tests (+4/-3)
run-tests.bat (+2/-1)
ubuntuone/controlpanel/backend.py (+3/-2)
ubuntuone/controlpanel/dbus_service.py (+1/-8)
ubuntuone/controlpanel/dbustests/__init__.py (+1/-1)
ubuntuone/controlpanel/gui/__init__.py (+6/-1)
ubuntuone/controlpanel/gui/qt/main/__init__.py (+5/-4)
ubuntuone/controlpanel/gui/qt/preferences.py (+1/-1)
ubuntuone/controlpanel/gui/qt/share_links.py (+2/-2)
ubuntuone/controlpanel/tests/test_backend.py (+1/-1)
ubuntuone/controlpanel/tests/test_web_client.py (+2/-2)
ubuntuone/controlpanel/web_client.py (+1/-8)

To merge this branch:

bzr merge lp://qastaging/~dobey/ubuntuone-control-panel/lint-roller

Medium

Fix Released

Link a bug report

Reviewer	Date Requested	Status
Mike McCracken (community)		Approve on 2012-10-26
Roberto Alsina (community)	2012-10-23	Approve on 2012-10-23
Review via email: mp+131079@code.qastaging.launchpad.net

Commit message

Use pyflakes instead of pylint.
Update code to avoid warnings from pyflakes.
Always use gobject-introspected API in dbus_service now.

Description of the change

You may need the pyflakes from ppa:ubuntuone/nightlies to test this.

This branch does need the branch in https://code.launchpad.net/~dobey/ubuntuone-client/lint-roller/+merge/131208 to be able to work with the changes from https://code.launchpad.net/~dobey/ubuntu-sso-client/lint-roller/+merge/131016 as well.

Revision history for this message

Roberto Alsina (ralsina) on 2012-10-23:

review: Approve

Revision history for this message

Mike McCracken (mikemc) wrote on 2012-10-26:

With the changes from sso lint-roller, controlpanel.backend is importing something from the wrong place now: it needs to be 'from ubuntu_sso.utils.webclient.common import UnauthorizedError, etc'

Traceback (most recent call last):
  File "/Users/mmccrack/Documents/Canonical/Source/test-improve-buildout/scripts/devsetup/bin/u1trial", line 40, in <module>
    ubuntuone.devtools.runners.main()
  File "/Users/mmccrack/Documents/Canonical/Source/test-improve-buildout/scripts/devsetup/parts/ubuntuone-dev-tools/ubuntuone/devtools/runners/__init__.py", line 277, in main
    suite = test_runner.get_suite(options)
  File "/Users/mmccrack/Documents/Canonical/Source/test-improve-buildout/scripts/devsetup/parts/ubuntuone-dev-tools/ubuntuone/devtools/runners/__init__.py", line 173, in get_suite
    config['ignore-paths']))
  File "/Users/mmccrack/Documents/Canonical/Source/test-improve-buildout/scripts/devsetup/parts/ubuntuone-dev-tools/ubuntuone/devtools/runners/__init__.py", line 157, in _collect_tests
    module_suite = self._load_unittest(filepath)
  File "/Users/mmccrack/Documents/Canonical/Source/test-improve-buildout/scripts/devsetup/parts/ubuntuone-dev-tools/ubuntuone/devtools/runners/__init__.py", line 98, in _load_unittest
    module = __import__(modpath, None, None, [""])
  File "/Users/mmccrack/Documents/Canonical/Source/test-improve-buildout/scripts/devsetup/parts/ubuntuone-control-panel/ubuntuone/controlpanel/gui/__init__.py", line 27, in <module>
    from ubuntuone.controlpanel.backend import UBUNTUONE_LINK
  File "/Users/mmccrack/Documents/Canonical/Source/test-improve-buildout/scripts/devsetup/parts/ubuntuone-control-panel/ubuntuone/controlpanel/backend.py", line 34, in <module>
    from ubuntu_sso.utils.webclient import UnauthorizedError, WebClientError
ImportError: cannot import name UnauthorizedError