Ubuntu One Control Panel

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

  1. lint-roller
  2. Merge into trunk
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
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-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.

To post a comment you must log in.
Revision history for this message
Roberto Alsina (ralsina) :
review: Approve
Revision history for this message
Mike McCracken (mikemc) wrote :

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

review: Needs Fixing
lp:~dobey/ubuntuone-control-panel/lint-roller updated
374. By dobey

Fix import issues from SSO changes.

Revision history for this message
Mike McCracken (mikemc) wrote :

Tests pass on darwin, looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'run-tests'
--- run-tests 2012-08-20 18:48:38 +0000
+++ run-tests 2012-10-26 15:57:20 +0000
@@ -32,9 +32,9 @@
32fi32fi
3333
34style_check() {34style_check() {
35 u1lint --ignore ubuntuone/controlpanel/gui/qt/ui35 USE_PYFLAKES=1 u1lint --ignore ubuntuone/controlpanel/gui/qt/ui
36 if [ -x `which pep8` ]; then36 if [ -x `which pep8` ]; then
37 pep8 --exclude '.svn,CVS,.bzr,.hg,.git,*_ui.py,*_rc.py' --repeat . bin/*37 pep8 --exclude '.bzr' --repeat . bin/*
38 else38 else
39 echo "Please install the 'pep8' package."39 echo "Please install the 'pep8' package."
40 fi40 fi
@@ -65,7 +65,7 @@
65 IGNORE_FILES="$WINDOWS_TESTS, $DARWIN_TESTS"65 IGNORE_FILES="$WINDOWS_TESTS, $DARWIN_TESTS"
66 IGNORE_DBUS=""66 IGNORE_DBUS=""
67 echo "*** Running DBus test suite ***"67 echo "*** Running DBus test suite ***"
68 u1trial --reactor=glib "$DBUS_TESTS_PATH"68 u1trial "$DBUS_TESTS_PATH"
69 REACTOR=gi69 REACTOR=gi
70fi70fi
7171
@@ -75,6 +75,7 @@
75echo "*** Running QT test suite for ""$MODULE"" ***"75echo "*** Running QT test suite for ""$MODULE"" ***"
76./setup.py build76./setup.py build
77$XVFB_CMDLINE u1trial $IGNORE_DBUS -i "$IGNORE_FILES" --reactor=qt4 --gui "$MODULE"77$XVFB_CMDLINE u1trial $IGNORE_DBUS -i "$IGNORE_FILES" --reactor=qt4 --gui "$MODULE"
78./setup.py clean
78rm -rf _trial_temp79rm -rf _trial_temp
79rm -rf build80rm -rf build
8081
8182
=== modified file 'run-tests.bat'
--- run-tests.bat 2012-10-08 20:39:21 +0000
+++ run-tests.bat 2012-10-26 15:57:20 +0000
@@ -71,8 +71,9 @@
7171
72IF %SKIPLINT% == 1 GOTO :CLEAN72IF %SKIPLINT% == 1 GOTO :CLEAN
73ECHO Performing style checks...73ECHO Performing style checks...
74SET USE_PYFLAKES=1
74"%LINTPATH%" --ignore ubuntuone\controlpanel\gui\qt\ui "%MODULE%"75"%LINTPATH%" --ignore ubuntuone\controlpanel\gui\qt\ui "%MODULE%"
75"%PEP8PATH%" --exclude ".svn,CVS,.bzr,.hg,.git,*_ui.py,*_rc.py" --repeat . bin\*76"%PEP8PATH%" --exclude ".bzr" --repeat . bin\*
76:CLEAN77:CLEAN
77:: Delete the temp folders78:: Delete the temp folders
78IF "%TRIAL_TEMP_DIR%" == "" GOTO :TRIALTEMPEXISTS79IF "%TRIAL_TEMP_DIR%" == "" GOTO :TRIALTEMPEXISTS
7980
=== modified file 'ubuntuone/controlpanel/backend.py'
--- ubuntuone/controlpanel/backend.py 2012-10-05 20:38:27 +0000
+++ ubuntuone/controlpanel/backend.py 2012-10-26 15:57:20 +0000
@@ -30,12 +30,13 @@
3030
31from ubuntuone.controlpanel import sd_client, replication_client31from ubuntuone.controlpanel import sd_client, replication_client
32from ubuntuone.controlpanel.logger import setup_logging, log_call32from ubuntuone.controlpanel.logger import setup_logging, log_call
33from ubuntuone.controlpanel.web_client import (33from ubuntuone.controlpanel.web_client import WebClient
34from ubuntu_sso.utils.webclient.common import (
34 UnauthorizedError,35 UnauthorizedError,
35 WebClient,
36 WebClientError,36 WebClientError,
37)37)
3838
39
39logger = setup_logging('backend')40logger = setup_logging('backend')
4041
41ACCOUNT_API = u"account/"42ACCOUNT_API = u"account/"
4243
=== modified file 'ubuntuone/controlpanel/dbus_service.py'
--- ubuntuone/controlpanel/dbus_service.py 2012-09-05 19:43:16 +0000
+++ ubuntuone/controlpanel/dbus_service.py 2012-10-26 15:57:20 +0000
@@ -17,19 +17,12 @@
17"""Export the control backend thru DBus."""17"""Export the control backend thru DBus."""
1818
19from functools import wraps19from functools import wraps
20import sys
2120
22import dbus.service21import dbus.service
23# pylint: disable=E0611,W040422from gi.repository import GObject
24if 'gobject' in sys.modules:
25 import gobject as GObject
26else:
27 from gi.repository import GObject
28# pylint: enable=E0611,W0404
2923
30from dbus.mainloop.glib import DBusGMainLoop24from dbus.mainloop.glib import DBusGMainLoop
31from dbus.service import method, signal25from dbus.service import method, signal
32
33from twisted.python.failure import Failure26from twisted.python.failure import Failure
34from ubuntuone.syncdaemon.interaction_interfaces import bool_str27from ubuntuone.syncdaemon.interaction_interfaces import bool_str
3528
3629
=== modified file 'ubuntuone/controlpanel/dbustests/__init__.py'
--- ubuntuone/controlpanel/dbustests/__init__.py 2011-11-21 13:37:07 +0000
+++ ubuntuone/controlpanel/dbustests/__init__.py 2012-10-26 15:57:20 +0000
@@ -32,7 +32,7 @@
32 """A DBus exception to be used in tests."""32 """A DBus exception to be used in tests."""
3333
3434
35class MockDBusNoMethods(dbus_service.dbus.service.Object):35class MockDBusNoMethods(dbus.service.Object):
36 """A mock that fails at the DBus layer (because it's got no methods!)."""36 """A mock that fails at the DBus layer (because it's got no methods!)."""
3737
3838
3939
=== modified file 'ubuntuone/controlpanel/gui/__init__.py'
--- ubuntuone/controlpanel/gui/__init__.py 2012-08-23 19:01:10 +0000
+++ ubuntuone/controlpanel/gui/__init__.py 2012-10-26 15:57:20 +0000
@@ -17,6 +17,7 @@
17"""The control panel UI for Ubuntu One."""17"""The control panel UI for Ubuntu One."""
1818
19import gettext19import gettext
20import sys
2021
21# pylint: disable=W061122# pylint: disable=W0611
22from ubuntuone.clientdefs import APP_NAME23from ubuntuone.clientdefs import APP_NAME
@@ -26,7 +27,11 @@
26from ubuntuone.controlpanel.backend import UBUNTUONE_LINK27from ubuntuone.controlpanel.backend import UBUNTUONE_LINK
2728
2829
29gettext.install(TRANSLATION_DOMAIN, unicode=True)30TRANSLATION = gettext.translation(TRANSLATION_DOMAIN, fallback=True)
31if sys.version_info < (3,):
32 _ = TRANSLATION.ugettext
33else:
34 _ = TRANSLATION.gettext
3035
3136
32ERROR_COLOR = u'red'37ERROR_COLOR = u'red'
3338
=== modified file 'ubuntuone/controlpanel/gui/qt/main/__init__.py'
--- ubuntuone/controlpanel/gui/qt/main/__init__.py 2012-10-04 20:34:22 +0000
+++ ubuntuone/controlpanel/gui/qt/main/__init__.py 2012-10-26 15:57:20 +0000
@@ -24,11 +24,12 @@
2424
25from ubuntuone.controlpanel.gui.qt.gui import start25from ubuntuone.controlpanel.gui.qt.gui import start
26# Module used to include the resources into this file26# Module used to include the resources into this file
27# Unused import images_rc, pylint: disable=W0611
28from ubuntuone.controlpanel.gui.qt.ui import images_rc27from ubuntuone.controlpanel.gui.qt.ui import images_rc
29# pylint: enable=W0611
30from ubuntuone.controlpanel.gui.qt.uniqueapp import UniqueApplication28from ubuntuone.controlpanel.gui.qt.uniqueapp import UniqueApplication
3129
30# Avoid unused import warnings
31assert(images_rc)
32
32# Invalid name "source", pylint: disable=C010333# Invalid name "source", pylint: disable=C0103
33if sys.platform in ('win32', 'darwin'):34if sys.platform in ('win32', 'darwin'):
34 from ubuntuone.controlpanel.gui.qt.main import twisted_main35 from ubuntuone.controlpanel.gui.qt.main import twisted_main
@@ -40,6 +41,7 @@
40if sys.platform == 'darwin':41if sys.platform == 'darwin':
41 from ubuntuone.controlpanel.gui.qt.main.darwin import (42 from ubuntuone.controlpanel.gui.qt.main.darwin import (
42 install_platform_event_handlers)43 install_platform_event_handlers)
44 assert(install_platform_event_handlers)
43else:45else:
44 install_platform_event_handlers = lambda app: None46 install_platform_event_handlers = lambda app: None
45# pylint: enable=C010347# pylint: enable=C0103
@@ -133,11 +135,10 @@
133135
134 install_config_and_daemons()136 install_config_and_daemons()
135137
136 # Unused variable 'menubar', pylint: disable=W0612
137 # need to keep a reference to the menu or our handler will be138 # need to keep a reference to the menu or our handler will be
138 # removed139 # removed
139 menubar = install_platform_event_handlers(app)140 menubar = install_platform_event_handlers(app)
140 # pylint: enable=W0612141 menubar
141142
142 # Unused variable 'window', 'icon', pylint: disable=W0612143 # Unused variable 'window', 'icon', pylint: disable=W0612
143 icon, window = start(lambda: source.main_quit(app),144 icon, window = start(lambda: source.main_quit(app),
144145
=== modified file 'ubuntuone/controlpanel/gui/qt/preferences.py'
--- ubuntuone/controlpanel/gui/qt/preferences.py 2012-08-27 19:03:09 +0000
+++ ubuntuone/controlpanel/gui/qt/preferences.py 2012-10-26 15:57:20 +0000
@@ -18,7 +18,7 @@
1818
19# Unused import QtGui19# Unused import QtGui
20# pylint: disable=W061120# pylint: disable=W0611
21from PyQt4 import QtGui, QtCore21from PyQt4 import QtCore
22# pylint: enable=W061122# pylint: enable=W0611
23from twisted.internet import defer23from twisted.internet import defer
2424
2525
=== modified file 'ubuntuone/controlpanel/gui/qt/share_links.py'
--- ubuntuone/controlpanel/gui/qt/share_links.py 2012-10-15 14:58:10 +0000
+++ ubuntuone/controlpanel/gui/qt/share_links.py 2012-10-26 15:57:20 +0000
@@ -31,18 +31,18 @@
31 SHARED_FILES,31 SHARED_FILES,
32)32)
3333
34# Unused import images_rc, pylint: disable=W0611
35from ubuntuone.controlpanel.gui.qt.ui import (34from ubuntuone.controlpanel.gui.qt.ui import (
36 images_rc,35 images_rc,
37 share_links_ui,36 share_links_ui,
38)37)
39# pylint: enable=W0611
40from ubuntuone.controlpanel.gui.qt.share_file import ShareFileWidget38from ubuntuone.controlpanel.gui.qt.share_file import ShareFileWidget
41from ubuntuone.controlpanel.gui.qt.share_links_search import (39from ubuntuone.controlpanel.gui.qt.share_links_search import (
42 get_system_icon_for_filename,40 get_system_icon_for_filename,
43)41)
44from ubuntuone.controlpanel.gui.qt.ubuntuonebin import UbuntuOneBin42from ubuntuone.controlpanel.gui.qt.ubuntuonebin import UbuntuOneBin
4543
44# Avoid unused import warnings
45assert(images_rc)
4646
47logger = setup_logging('qt.share_links')47logger = setup_logging('qt.share_links')
4848
4949
=== modified file 'ubuntuone/controlpanel/tests/test_backend.py'
--- ubuntuone/controlpanel/tests/test_backend.py 2012-09-05 22:58:33 +0000
+++ ubuntuone/controlpanel/tests/test_backend.py 2012-10-26 15:57:20 +0000
@@ -1056,7 +1056,7 @@
1056 assert sid not in expected1056 assert sid not in expected
1057 expected[sid] = volume1057 expected[sid] = volume
10581058
1059 _ = yield self.be.volumes_info()1059 yield self.be.volumes_info()
10601060
1061 self.assertEqual(len(self.be._volumes), len(expected))1061 self.assertEqual(len(self.be._volumes), len(expected))
1062 self.assertEqual(self.be._volumes, expected)1062 self.assertEqual(self.be._volumes, expected)
10631063
=== modified file 'ubuntuone/controlpanel/tests/test_web_client.py'
--- ubuntuone/controlpanel/tests/test_web_client.py 2012-04-18 16:08:44 +0000
+++ ubuntuone/controlpanel/tests/test_web_client.py 2012-10-26 15:57:20 +0000
@@ -24,9 +24,9 @@
24from ubuntuone.devtools.testing.txwebserver import HTTPWebServer24from ubuntuone.devtools.testing.txwebserver import HTTPWebServer
2525
26from ubuntuone.controlpanel.tests import TestCase26from ubuntuone.controlpanel.tests import TestCase
27from ubuntuone.controlpanel.web_client import (27from ubuntuone.controlpanel.web_client import WebClient
28from ubuntu_sso.utils.webclient.common import (
28 UnauthorizedError,29 UnauthorizedError,
29 WebClient,
30 WebClientError,30 WebClientError,
31)31)
32from ubuntuone.platform.credentials import APP_NAME32from ubuntuone.platform.credentials import APP_NAME
3333
=== modified file 'ubuntuone/controlpanel/web_client.py'
--- ubuntuone/controlpanel/web_client.py 2012-03-12 17:52:26 +0000
+++ ubuntuone/controlpanel/web_client.py 2012-10-26 15:57:20 +0000
@@ -19,14 +19,7 @@
19import simplejson19import simplejson
2020
21from twisted.internet import defer21from twisted.internet import defer
22# need to export the exceptions to avoid API breakage22from ubuntu_sso.utils.webclient import webclient_factory
23# pylint: disable=W0611
24from ubuntu_sso.utils.webclient import (
25 UnauthorizedError,
26 WebClientError,
27 webclient_factory,
28)
29# pylint: enable=W0611
3023
31from ubuntuone.controlpanel import WEBSERVICE_BASE_URL24from ubuntuone.controlpanel import WEBSERVICE_BASE_URL
32from ubuntuone.controlpanel.logger import setup_logging25from ubuntuone.controlpanel.logger import setup_logging

Subscribers

People subscribed via source and target branches

to all changes: