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 on 2012-10-23
Status: Merged
Approved by: dobey on 2012-10-26
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 on 2012-10-26
Roberto Alsina (community) 2012-10-23 Approve on 2012-10-23
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.
Roberto Alsina (ralsina) :
review: Approve
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 on 2012-10-26
374. By dobey on 2012-10-26

Fix import issues from SSO changes.

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
1=== modified file 'run-tests'
2--- run-tests 2012-08-20 18:48:38 +0000
3+++ run-tests 2012-10-26 15:57:20 +0000
4@@ -32,9 +32,9 @@
5 fi
6
7 style_check() {
8- u1lint --ignore ubuntuone/controlpanel/gui/qt/ui
9+ USE_PYFLAKES=1 u1lint --ignore ubuntuone/controlpanel/gui/qt/ui
10 if [ -x `which pep8` ]; then
11- pep8 --exclude '.svn,CVS,.bzr,.hg,.git,*_ui.py,*_rc.py' --repeat . bin/*
12+ pep8 --exclude '.bzr' --repeat . bin/*
13 else
14 echo "Please install the 'pep8' package."
15 fi
16@@ -65,7 +65,7 @@
17 IGNORE_FILES="$WINDOWS_TESTS, $DARWIN_TESTS"
18 IGNORE_DBUS=""
19 echo "*** Running DBus test suite ***"
20- u1trial --reactor=glib "$DBUS_TESTS_PATH"
21+ u1trial "$DBUS_TESTS_PATH"
22 REACTOR=gi
23 fi
24
25@@ -75,6 +75,7 @@
26 echo "*** Running QT test suite for ""$MODULE"" ***"
27 ./setup.py build
28 $XVFB_CMDLINE u1trial $IGNORE_DBUS -i "$IGNORE_FILES" --reactor=qt4 --gui "$MODULE"
29+./setup.py clean
30 rm -rf _trial_temp
31 rm -rf build
32
33
34=== modified file 'run-tests.bat'
35--- run-tests.bat 2012-10-08 20:39:21 +0000
36+++ run-tests.bat 2012-10-26 15:57:20 +0000
37@@ -71,8 +71,9 @@
38
39 IF %SKIPLINT% == 1 GOTO :CLEAN
40 ECHO Performing style checks...
41+SET USE_PYFLAKES=1
42 "%LINTPATH%" --ignore ubuntuone\controlpanel\gui\qt\ui "%MODULE%"
43-"%PEP8PATH%" --exclude ".svn,CVS,.bzr,.hg,.git,*_ui.py,*_rc.py" --repeat . bin\*
44+"%PEP8PATH%" --exclude ".bzr" --repeat . bin\*
45 :CLEAN
46 :: Delete the temp folders
47 IF "%TRIAL_TEMP_DIR%" == "" GOTO :TRIALTEMPEXISTS
48
49=== modified file 'ubuntuone/controlpanel/backend.py'
50--- ubuntuone/controlpanel/backend.py 2012-10-05 20:38:27 +0000
51+++ ubuntuone/controlpanel/backend.py 2012-10-26 15:57:20 +0000
52@@ -30,12 +30,13 @@
53
54 from ubuntuone.controlpanel import sd_client, replication_client
55 from ubuntuone.controlpanel.logger import setup_logging, log_call
56-from ubuntuone.controlpanel.web_client import (
57+from ubuntuone.controlpanel.web_client import WebClient
58+from ubuntu_sso.utils.webclient.common import (
59 UnauthorizedError,
60- WebClient,
61 WebClientError,
62 )
63
64+
65 logger = setup_logging('backend')
66
67 ACCOUNT_API = u"account/"
68
69=== modified file 'ubuntuone/controlpanel/dbus_service.py'
70--- ubuntuone/controlpanel/dbus_service.py 2012-09-05 19:43:16 +0000
71+++ ubuntuone/controlpanel/dbus_service.py 2012-10-26 15:57:20 +0000
72@@ -17,19 +17,12 @@
73 """Export the control backend thru DBus."""
74
75 from functools import wraps
76-import sys
77
78 import dbus.service
79-# pylint: disable=E0611,W0404
80-if 'gobject' in sys.modules:
81- import gobject as GObject
82-else:
83- from gi.repository import GObject
84-# pylint: enable=E0611,W0404
85+from gi.repository import GObject
86
87 from dbus.mainloop.glib import DBusGMainLoop
88 from dbus.service import method, signal
89-
90 from twisted.python.failure import Failure
91 from ubuntuone.syncdaemon.interaction_interfaces import bool_str
92
93
94=== modified file 'ubuntuone/controlpanel/dbustests/__init__.py'
95--- ubuntuone/controlpanel/dbustests/__init__.py 2011-11-21 13:37:07 +0000
96+++ ubuntuone/controlpanel/dbustests/__init__.py 2012-10-26 15:57:20 +0000
97@@ -32,7 +32,7 @@
98 """A DBus exception to be used in tests."""
99
100
101-class MockDBusNoMethods(dbus_service.dbus.service.Object):
102+class MockDBusNoMethods(dbus.service.Object):
103 """A mock that fails at the DBus layer (because it's got no methods!)."""
104
105
106
107=== modified file 'ubuntuone/controlpanel/gui/__init__.py'
108--- ubuntuone/controlpanel/gui/__init__.py 2012-08-23 19:01:10 +0000
109+++ ubuntuone/controlpanel/gui/__init__.py 2012-10-26 15:57:20 +0000
110@@ -17,6 +17,7 @@
111 """The control panel UI for Ubuntu One."""
112
113 import gettext
114+import sys
115
116 # pylint: disable=W0611
117 from ubuntuone.clientdefs import APP_NAME
118@@ -26,7 +27,11 @@
119 from ubuntuone.controlpanel.backend import UBUNTUONE_LINK
120
121
122-gettext.install(TRANSLATION_DOMAIN, unicode=True)
123+TRANSLATION = gettext.translation(TRANSLATION_DOMAIN, fallback=True)
124+if sys.version_info < (3,):
125+ _ = TRANSLATION.ugettext
126+else:
127+ _ = TRANSLATION.gettext
128
129
130 ERROR_COLOR = u'red'
131
132=== modified file 'ubuntuone/controlpanel/gui/qt/main/__init__.py'
133--- ubuntuone/controlpanel/gui/qt/main/__init__.py 2012-10-04 20:34:22 +0000
134+++ ubuntuone/controlpanel/gui/qt/main/__init__.py 2012-10-26 15:57:20 +0000
135@@ -24,11 +24,12 @@
136
137 from ubuntuone.controlpanel.gui.qt.gui import start
138 # Module used to include the resources into this file
139-# Unused import images_rc, pylint: disable=W0611
140 from ubuntuone.controlpanel.gui.qt.ui import images_rc
141-# pylint: enable=W0611
142 from ubuntuone.controlpanel.gui.qt.uniqueapp import UniqueApplication
143
144+# Avoid unused import warnings
145+assert(images_rc)
146+
147 # Invalid name "source", pylint: disable=C0103
148 if sys.platform in ('win32', 'darwin'):
149 from ubuntuone.controlpanel.gui.qt.main import twisted_main
150@@ -40,6 +41,7 @@
151 if sys.platform == 'darwin':
152 from ubuntuone.controlpanel.gui.qt.main.darwin import (
153 install_platform_event_handlers)
154+ assert(install_platform_event_handlers)
155 else:
156 install_platform_event_handlers = lambda app: None
157 # pylint: enable=C0103
158@@ -133,11 +135,10 @@
159
160 install_config_and_daemons()
161
162- # Unused variable 'menubar', pylint: disable=W0612
163 # need to keep a reference to the menu or our handler will be
164 # removed
165 menubar = install_platform_event_handlers(app)
166- # pylint: enable=W0612
167+ menubar
168
169 # Unused variable 'window', 'icon', pylint: disable=W0612
170 icon, window = start(lambda: source.main_quit(app),
171
172=== modified file 'ubuntuone/controlpanel/gui/qt/preferences.py'
173--- ubuntuone/controlpanel/gui/qt/preferences.py 2012-08-27 19:03:09 +0000
174+++ ubuntuone/controlpanel/gui/qt/preferences.py 2012-10-26 15:57:20 +0000
175@@ -18,7 +18,7 @@
176
177 # Unused import QtGui
178 # pylint: disable=W0611
179-from PyQt4 import QtGui, QtCore
180+from PyQt4 import QtCore
181 # pylint: enable=W0611
182 from twisted.internet import defer
183
184
185=== modified file 'ubuntuone/controlpanel/gui/qt/share_links.py'
186--- ubuntuone/controlpanel/gui/qt/share_links.py 2012-10-15 14:58:10 +0000
187+++ ubuntuone/controlpanel/gui/qt/share_links.py 2012-10-26 15:57:20 +0000
188@@ -31,18 +31,18 @@
189 SHARED_FILES,
190 )
191
192-# Unused import images_rc, pylint: disable=W0611
193 from ubuntuone.controlpanel.gui.qt.ui import (
194 images_rc,
195 share_links_ui,
196 )
197-# pylint: enable=W0611
198 from ubuntuone.controlpanel.gui.qt.share_file import ShareFileWidget
199 from ubuntuone.controlpanel.gui.qt.share_links_search import (
200 get_system_icon_for_filename,
201 )
202 from ubuntuone.controlpanel.gui.qt.ubuntuonebin import UbuntuOneBin
203
204+# Avoid unused import warnings
205+assert(images_rc)
206
207 logger = setup_logging('qt.share_links')
208
209
210=== modified file 'ubuntuone/controlpanel/tests/test_backend.py'
211--- ubuntuone/controlpanel/tests/test_backend.py 2012-09-05 22:58:33 +0000
212+++ ubuntuone/controlpanel/tests/test_backend.py 2012-10-26 15:57:20 +0000
213@@ -1056,7 +1056,7 @@
214 assert sid not in expected
215 expected[sid] = volume
216
217- _ = yield self.be.volumes_info()
218+ yield self.be.volumes_info()
219
220 self.assertEqual(len(self.be._volumes), len(expected))
221 self.assertEqual(self.be._volumes, expected)
222
223=== modified file 'ubuntuone/controlpanel/tests/test_web_client.py'
224--- ubuntuone/controlpanel/tests/test_web_client.py 2012-04-18 16:08:44 +0000
225+++ ubuntuone/controlpanel/tests/test_web_client.py 2012-10-26 15:57:20 +0000
226@@ -24,9 +24,9 @@
227 from ubuntuone.devtools.testing.txwebserver import HTTPWebServer
228
229 from ubuntuone.controlpanel.tests import TestCase
230-from ubuntuone.controlpanel.web_client import (
231+from ubuntuone.controlpanel.web_client import WebClient
232+from ubuntu_sso.utils.webclient.common import (
233 UnauthorizedError,
234- WebClient,
235 WebClientError,
236 )
237 from ubuntuone.platform.credentials import APP_NAME
238
239=== modified file 'ubuntuone/controlpanel/web_client.py'
240--- ubuntuone/controlpanel/web_client.py 2012-03-12 17:52:26 +0000
241+++ ubuntuone/controlpanel/web_client.py 2012-10-26 15:57:20 +0000
242@@ -19,14 +19,7 @@
243 import simplejson
244
245 from twisted.internet import defer
246-# need to export the exceptions to avoid API breakage
247-# pylint: disable=W0611
248-from ubuntu_sso.utils.webclient import (
249- UnauthorizedError,
250- WebClientError,
251- webclient_factory,
252-)
253-# pylint: enable=W0611
254+from ubuntu_sso.utils.webclient import webclient_factory
255
256 from ubuntuone.controlpanel import WEBSERVICE_BASE_URL
257 from ubuntuone.controlpanel.logger import setup_logging

Subscribers

People subscribed via source and target branches

to all changes: