Merge lp:~dobey/ubuntuone-control-panel/lint-roller into lp:ubuntuone-control-panel
Proposed by
dobey
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | dobey | ||||
Approved revision: | 374 | ||||
Merged at revision: | 372 | ||||
Proposed branch: | lp:~dobey/ubuntuone-control-panel/lint-roller | ||||
Merge into: | lp: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:~dobey/ubuntuone-control-panel/lint-roller | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Mike McCracken (community) | Approve | ||
Roberto Alsina (community) | Approve | ||
Review via email: mp+131079@code.launchpad.net |
Commit message
Use pyflakes instead of pylint.
Update code to avoid warnings from pyflakes.
Always use gobject-
Description of the change
You may need the pyflakes from ppa:ubuntuone/
This branch does need the branch in https:/
To post a comment you must log in.
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): mmccrack/ Documents/ Canonical/ Source/ test-improve- buildout/ scripts/ devsetup/ bin/u1trial" , line 40, in <module> devtools. runners. main() mmccrack/ Documents/ Canonical/ Source/ test-improve- buildout/ scripts/ devsetup/ parts/ubuntuone -dev-tools/ ubuntuone/ devtools/ runners/ __init_ _.py", line 277, in main get_suite( options) mmccrack/ Documents/ Canonical/ Source/ test-improve- buildout/ scripts/ devsetup/ parts/ubuntuone -dev-tools/ ubuntuone/ devtools/ runners/ __init_ _.py", line 173, in get_suite 'ignore- paths'] )) mmccrack/ Documents/ Canonical/ Source/ test-improve- buildout/ scripts/ devsetup/ parts/ubuntuone -dev-tools/ ubuntuone/ devtools/ runners/ __init_ _.py", line 157, in _collect_tests unittest( filepath) mmccrack/ Documents/ Canonical/ Source/ test-improve- buildout/ scripts/ devsetup/ parts/ubuntuone -dev-tools/ ubuntuone/ devtools/ runners/ __init_ _.py", line 98, in _load_unittest mmccrack/ Documents/ Canonical/ Source/ test-improve- buildout/ scripts/ devsetup/ parts/ubuntuone -control- panel/ubuntuone /controlpanel/ gui/__init_ _.py", line 27, in <module> controlpanel. backend import UBUNTUONE_LINK mmccrack/ Documents/ Canonical/ Source/ test-improve- buildout/ scripts/ devsetup/ parts/ubuntuone -control- panel/ubuntuone /controlpanel/ backend. py", line 34, in <module> sso.utils. webclient import UnauthorizedError, WebClientError
File "/Users/
ubuntuone.
File "/Users/
suite = test_runner.
File "/Users/
config[
File "/Users/
module_suite = self._load_
File "/Users/
module = __import__(modpath, None, None, [""])
File "/Users/
from ubuntuone.
File "/Users/
from ubuntu_
ImportError: cannot import name UnauthorizedError