Merge lp:~nataliabidart/ubuntuone-control-panel/fix-lint into lp:ubuntuone-control-panel

[Natalia Bidart]

- Fix lint issues (LP: #920640).

[Roberto Alsina (ralsina)]

+1

review: Approve

=== modified file 'ubuntuone/controlpanel/dbus_service.py'
--- ubuntuone/controlpanel/dbus_service.py	2011-09-14 19:08:52 +0000
+++ ubuntuone/controlpanel/dbus_service.py	2012-01-23 20:19:25 +0000
@@ -1,9 +1,6 @@
 # -*- coding: utf-8 -*-
-
-# Authors: Alejandro J. Cura <[e-mail]>
-# Authors: Natalia B. Bidart <[e-mail]>
 #
-# Copyright 2010 Canonical Ltd.
+# Copyright 2010-2012 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -23,14 +20,12 @@
 import sys
 
 import dbus.service
-# pylint: disable=E0611
-# pylint: disable=W0404
+# pylint: disable=E0611,W0404
 if 'gobject' in sys.modules:
     import gobject as GObject
 else:
     from gi.repository import GObject
-# pylint: enable=W0404
-# pylint: enable=E0611
+# pylint: enable=E0611,W0404
 
 from dbus.mainloop.glib import DBusGMainLoop
 from dbus.service import method, signal
@@ -156,6 +151,8 @@
 class ControlPanelBackend(dbus.service.Object):
     """Export the Control Panel backend thru DBus."""
 
+    # pylint: disable=C0103,E1002
+
     def __init__(self, backend, *args, **kwargs):
         """Create this instance of the backend."""
         super(ControlPanelBackend, self).__init__(*args, **kwargs)
@@ -164,8 +161,6 @@
         logger.debug('ControlPanelBackend: created with %r, %r.',
                      args, kwargs)
 
-    # pylint: disable=C0103
-
     @log_call(logger.error)
     @signal(dbus_interface=DBUS_PREFERENCES_IFACE, signature="a{ss}")
     def UnauthorizedError(self, error):

=== modified file 'ubuntuone/controlpanel/gui/gtk/gui.py'
--- ubuntuone/controlpanel/gui/gtk/gui.py	2011-09-19 18:13:28 +0000
+++ ubuntuone/controlpanel/gui/gtk/gui.py	2012-01-23 20:19:25 +0000
@@ -840,6 +840,8 @@
         else:
             self.on_success()
 
+        # Class 'style' has no 'bg' member
+        # pylint: disable=E1101
         odd_row_color = self.message.style.bg[gtk.STATE_NORMAL]
         for i, device_info in enumerate(info):
             device = Device(confirm_remove_dialog=self.confirm_remove_dialog)

=== modified file 'ubuntuone/controlpanel/gui/gtk/tests/test_widgets.py'
--- ubuntuone/controlpanel/gui/gtk/tests/test_widgets.py	2011-10-24 21:48:27 +0000
+++ ubuntuone/controlpanel/gui/gtk/tests/test_widgets.py	2012-01-23 20:19:25 +0000
@@ -24,6 +24,10 @@
 from ubuntuone.controlpanel.gui.gtk import widgets
 
 
+# Class 'style' has no 'fg' member
+# pylint: disable=E1101
+
+
 class LoadingTestCase(TestCase):
     """Test suite for the Loading widget (a spinner plus a label)."""
 

=== modified file 'ubuntuone/controlpanel/gui/gtk/widgets.py'
--- ubuntuone/controlpanel/gui/gtk/widgets.py	2011-04-11 17:30:04 +0000
+++ ubuntuone/controlpanel/gui/gtk/widgets.py	2012-01-23 20:19:25 +0000
@@ -130,6 +130,9 @@
     # Invalid name, Missing docstring, do not list fix-mes
     # pylint: disable=C0103,C0111,W0511
 
+    # Class 'style' has no 'attach', 'set_background', 'paint_flat_box' member
+    # pylint: disable=E1101
+
     __gsignals__ = {
         "damage_event": "override",
     }

=== modified file 'ubuntuone/controlpanel/gui/qt/uniqueapp/__init__.py'
--- ubuntuone/controlpanel/gui/qt/uniqueapp/__init__.py	2012-01-02 14:29:16 +0000
+++ ubuntuone/controlpanel/gui/qt/uniqueapp/__init__.py	2012-01-23 20:19:25 +0000
@@ -20,9 +20,9 @@
 import sys
 
 if sys.platform == "win32":
-    import windows as platform
+    from ubuntuone.controlpanel.gui.qt.uniqueapp import windows as platform
 else:
-    import linux as platform
+    from ubuntuone.controlpanel.gui.qt.uniqueapp import linux as platform
 
 #pylint: disable=C0103
 UniqueApplication = platform.UniqueApplication

=== modified file 'ubuntuone/controlpanel/tests/test_sd_client.py'
--- ubuntuone/controlpanel/tests/test_sd_client.py	2011-11-21 13:32:44 +0000
+++ ubuntuone/controlpanel/tests/test_sd_client.py	2012-01-23 20:19:25 +0000
@@ -34,6 +34,9 @@
 from ubuntuone.controlpanel import sd_client
 from ubuntuone.controlpanel.tests import TestCase
 
+# Instance of 'SyncDaemonTool' has no 'foo' member
+# pylint: disable=E1101
+
 
 SAMPLE_LIMITS = {'upload': 999, 'download': 838}