Merge lp:~dobey/ubuntu-sso-client/lint-roller into lp:ubuntu-sso-client

[dobey]

Switch to pyflakes.
Fix all the resulting issues from switching to pyflakes.

You'll likely need the version of pyflakes from ppa:ubuntuone/nightlies to test this.

[Roberto Alsina (ralsina)]

review: Approve

[lp:~dobey/ubuntu-sso-client/lint-roller]

1009. By dobey on 2012-10-23

Bring cleanup/pep8 args lists in line with main run-tests script.

1010. By dobey on 2012-10-24

Don't skip this test any more, as it has been fixed in trunk now.

1011. By dobey on 2012-10-24

Merged from trunk.

[Mike McCracken (mikemc)]

:)

review: Approve

=== modified file 'bin/ubuntu-sso-login'
--- bin/ubuntu-sso-login	2012-06-27 20:00:27 +0000
+++ bin/ubuntu-sso-login	2012-10-24 17:16:22 +0000
@@ -33,6 +33,7 @@
 
 # import decimal even if we don't need it, pylint: disable=W0611
 import decimal
+assert(decimal)
 # This is a workaround for LP: #467397. Some module in our depency chain sets
 # the locale and imports decimal, and that generates the following trace:
 # Traceback (most recent call last):

=== modified file 'run-mac-tests'
--- run-mac-tests	2012-08-16 04:28:32 +0000
+++ run-mac-tests	2012-10-24 17:16:22 +0000
@@ -40,7 +40,7 @@
 style_check() {
     USE_PYFLAKES=1 u1lint --ignore ubuntu_sso/qt/ui
     if [ -x `which pep8` ]; then
-        pep8 --exclude '.svn,CVS,.bzr,.hg,.git,*_ui.py,*_rc.py' --repeat . bin/*
+        pep8 --exclude '.bzr' --repeat . bin/*
     else
         echo "Please install the 'pep8' package."
     fi
@@ -49,6 +49,7 @@
 echo "*** Running QT test suite for ""$MODULE"" ***"
 python ./setup.py build
 u1trial --reactor=qt4 --gui -i "test_linux.py, test_qt.py, test_windows.py, test_glib.py, test_txsecrets.py" "$MODULE"
+python ./setup.py clean
 rm -rf _trial_temp
 rm -rf build
 

=== modified file 'run-tests'
--- run-tests	2012-06-27 19:03:44 +0000
+++ run-tests	2012-10-24 17:16:22 +0000
@@ -45,9 +45,9 @@
 fi
 
 style_check() {
-    u1lint --ignore ubuntu_sso/qt/ui
+    USE_PYFLAKES=1 u1lint --ignore ubuntu_sso/qt/ui
     if [ -x `which pep8` ]; then
-        pep8 --exclude '.svn,CVS,.bzr,.hg,.git,*_ui.py,*_rc.py' --repeat . bin/*
+        pep8 --exclude '.bzr' --repeat . bin/*
     else
         echo "Please install the 'pep8' package."
     fi
@@ -62,6 +62,7 @@
 echo "*** Running QT test suite for ""$MODULE"" ***"
 ./setup.py build
 $XVFB_CMDLINE u1trial --reactor=qt4 --gui -i $LINUX_IGNORE_FILES "$MODULE"
+./setup.py clean
 rm -rf _trial_temp
 rm -rf build
 

=== modified file 'run-tests.bat'
--- run-tests.bat	2012-10-04 19:25:14 +0000
+++ run-tests.bat	2012-10-24 17:16:22 +0000
@@ -85,10 +85,11 @@
 
 ECHO Performing style checks...
 SET IGNORE_LINT="ubuntu_sso\networkstate\linux.py,ubuntu_sso\main\linux.py,ubuntu_sso\main\tests\test_linux.py,ubuntu_sso\utils\txsecrets.py,ubuntu_sso\utils\tests\test_txsecrets.py,ubuntu_sso\tests\bin,bin\ubuntu-sso-login"
+SET USE_PYFLAKES=1
 "%LINTPATH%" -i "%IGNORE_LINT%" ubuntu_sso
 :: test for style if we can, if pep8 is not present, move to the end
 ECHO Running PEP-8 Check...
-"%PEP8PATH%" --repeat .
+"%PEP8PATH%" --exclude ".bzr" --repeat . bin\*
 :CLEAN
 
 IF EXIST \.coverage RMDIR /s /q \.coverage

=== modified file 'ubuntu_sso/keyring/__init__.py'
--- ubuntu_sso/keyring/__init__.py	2012-07-31 20:51:00 +0000
+++ ubuntu_sso/keyring/__init__.py	2012-10-24 17:16:22 +0000
@@ -111,10 +111,13 @@
     returnValue(None)
 
 
+Keyring = None
 if sys.platform in ('win32', 'darwin'):
-    from ubuntu_sso.keyring.pykeyring import Keyring
+    from ubuntu_sso.keyring import pykeyring
+    Keyring = pykeyring.Keyring
 else:
-    from ubuntu_sso.keyring.linux import Keyring
+    from ubuntu_sso.keyring import linux as linux_kr
+    Keyring = linux_kr.Keyring
 
 
 class UbuntuOneOAuthKeyring(Keyring):

=== modified file 'ubuntu_sso/networkstate/__init__.py'
--- ubuntu_sso/networkstate/__init__.py	2012-04-23 12:22:03 +0000
+++ ubuntu_sso/networkstate/__init__.py	2012-10-24 17:16:22 +0000
@@ -34,9 +34,6 @@
 # pylint: disable=C0103
 
 NetworkManagerState = None
-ONLINE = None
-OFFLINE = None
-UNKNOWN = None
 
 
 class NetworkFailException(Exception):
@@ -55,7 +52,4 @@
     networksource = linux
 
 NetworkManagerState = networksource.NetworkManagerState
-ONLINE = networksource.ONLINE
-OFFLINE = networksource.OFFLINE
-UNKNOWN = networksource.UNKNOWN
 is_machine_connected = networksource.is_machine_connected

=== modified file 'ubuntu_sso/networkstate/linux.py'
--- ubuntu_sso/networkstate/linux.py	2012-10-05 14:39:37 +0000
+++ ubuntu_sso/networkstate/linux.py	2012-10-24 17:16:22 +0000
@@ -33,15 +33,13 @@
 from twisted.internet import defer
 
 from ubuntu_sso.networkstate import NetworkFailException
-# pylint: disable=W0611
 from ubuntu_sso.networkstate.networkstates import (
-    ONLINE, OFFLINE, UNKNOWN,
+    ONLINE, OFFLINE,
 
     NM_STATE_CONNECTING_LIST,
     NM_STATE_CONNECTED_LIST,
     NM_STATE_DISCONNECTED_LIST,
     )
-# pylint: enable=W0611
 from ubuntu_sso.logger import setup_logging
 logger = setup_logging("ubuntu_sso.networkstate")
 
@@ -103,7 +101,7 @@
             nm_proxy.Get(NM_DBUS_INTERFACE, "State",
                          reply_handler=self.got_state,
                          error_handler=self.got_error)
-        except Exception as e:  # pylint: disable=W0703
+        except Exception as e:
             self.got_error(e)
 
 
@@ -119,13 +117,11 @@
         result = (state == ONLINE)
         d.callback(result)
 
-    # pylint: disable=W0702, W0703
     try:
         network = NetworkManagerState(got_state)
         network.find_online_state()
     except Exception as e:
         logger.exception('is_machine_connected failed with:')
         d.errback(NetworkFailException(e))
-    # pylint: enable=W0702, W0703
 
     return d

=== modified file 'ubuntu_sso/qt/main/__init__.py'
--- ubuntu_sso/qt/main/__init__.py	2012-07-03 16:36:41 +0000
+++ ubuntu_sso/qt/main/__init__.py	2012-10-24 17:16:22 +0000
@@ -34,21 +34,20 @@
 from PyQt4 import QtGui, QtCore
 
 # Module used to include the resources into this file
-# Unused import resources_rc, pylint: disable=W0611
 from ubuntu_sso.qt.ui import resources_rc
-# pylint: enable=W0611
 from ubuntu_sso.qt.ubuntu_sso_wizard import UbuntuSSOClientGUI
 from ubuntu_sso.utils import compat, PLATFORM_QSS
 
 
-# Invalid name "source", pylint: disable=C0103
+# Poke resources_rc to avoid pyflakes complaining about unused import
+assert(resources_rc)
+
 if sys.platform in ('win32', 'darwin'):
     from ubuntu_sso.qt.main import windows
     source = windows
 else:
     from ubuntu_sso.qt.main import linux
     source = linux
-# pylint: enable=C0103
 
 
 def main(**kwargs):
@@ -72,7 +71,6 @@
         if isinstance(value, compat.binary_type):
             kwargs[key] = value.decode('utf-8')
 
-    # Unused variable 'ui', pylint: disable=W0612
     close_callback = lambda: source.main_quit(app)
     ui = UbuntuSSOClientGUI(close_callback=close_callback, **kwargs)
     style = QtGui.QStyle.alignedRect(

=== modified file 'ubuntu_sso/qt/proxy_dialog.py'
--- ubuntu_sso/qt/proxy_dialog.py	2012-07-03 16:14:49 +0000
+++ ubuntu_sso/qt/proxy_dialog.py	2012-10-24 17:16:22 +0000
@@ -115,15 +115,13 @@
         password = compat.text_type(
                         self.ui.password_entry.text()).encode('utf8')
         creds = dict(username=username, password=password)
-        # pylint: disable=W0703, W0612
         try:
             logger.debug('Save credentials as for domain %s.', self.domain)
             yield self.keyring.set_credentials(self.domain, creds)
         except Exception as e:
-            logger.exception('Could not set credentials:')
+            logger.exception('Could not set credentials: %s', e)
             self.done(EXCEPTION_RAISED)
         logger.debug('Stored creds')
-        # pylint: disable=W0703, W0612
         self.done(USER_SUCCESS)
 
     def _on_cancel_clicked(self, *args):
@@ -169,15 +167,13 @@
 
 def main():
     """Main method used to show the creds dialog."""
-    # Keep ref to avoid core dump, pylint: disable=W0612
-
     if sys.platform == 'win32':
         import qt4reactor
         qt4reactor.install()
         logger.debug('Qt reactor installed.')
 
     app = QApplication(sys.argv)
-    # pylint: enable=W0612
+    app
     args = parse_args()
     win = ProxyCredsDialog(domain=args.domain,
                            retry=args.retry)
@@ -187,11 +183,9 @@
         win.finished.connect(exit_code)
 
         logger.debug('Starting reactor')
-        # pylint: disable=E1101
         from twisted.internet import reactor
         logger.debug('QApp is %s', reactor.qApp)
         reactor.run()
-        # pylint: enable=E1101
     else:
         return_code = win.exec_()
         sys.exit(return_code)

=== modified file 'ubuntu_sso/qt/ssl_dialog.py'
--- ubuntu_sso/qt/ssl_dialog.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/qt/ssl_dialog.py	2012-10-24 17:16:22 +0000
@@ -41,9 +41,7 @@
 
 from ubuntu_sso import USER_CANCELLATION, USER_SUCCESS
 from ubuntu_sso.logger import setup_gui_logging
-# Unused import resources_rc, pylint: disable=W0611
 from ubuntu_sso.qt.ui import resources_rc
-# pylint: enable=W0611
 from ubuntu_sso.qt.expander import QExpander
 from ubuntu_sso.qt.ui.ssl_dialog_ui import Ui_SSLDialog
 from ubuntu_sso.utils.ui import (
@@ -73,6 +71,7 @@
                     '</ul>')
 
 logger = setup_gui_logging("ubuntu_sso.qt.proxy_dialog")
+assert(resources_rc)
 
 
 class SSLDialog(QDialog):
@@ -165,9 +164,8 @@
 
 def main():
     """Main method used to show the creds dialog."""
-    # pylint: disable=W0612
     app = QApplication(sys.argv)
-    # pylint: enable=W0612
+    assert(app)
     args = parse_args()
     win = SSLDialog(args.appname, domain=args.domain, details=args.details)
     return_code = win.exec_()

=== modified file 'ubuntu_sso/utils/__init__.py'
--- ubuntu_sso/utils/__init__.py	2012-10-15 22:08:54 +0000
+++ ubuntu_sso/utils/__init__.py	2012-10-24 17:16:22 +0000
@@ -83,9 +83,7 @@
 
     # otherwise, try to load 'dir_constant' from installation path
     try:
-        # Unused variable 'ubuntu_sso'
-        # pylint: disable=W0612, F0401, E0611
-        import ubuntu_sso.constants
+        __import__('ubuntu_sso.constants', None, None, [''])
         module = sys.modules.get('ubuntu_sso.constants')
         return getattr(module, dir_constant)
     except (ImportError, AttributeError):

=== modified file 'ubuntu_sso/utils/tests/test_tcpactivation.py'
--- ubuntu_sso/utils/tests/test_tcpactivation.py	2012-06-27 21:58:15 +0000
+++ ubuntu_sso/utils/tests/test_tcpactivation.py	2012-10-24 17:16:22 +0000
@@ -31,19 +31,10 @@
 
 from __future__ import print_function
 
-# twisted uses a different coding convention
-# pylint: disable=C0103,W0232
-
-# this test module access a few protected members (starting with _)
-# pylint: disable=W0212
-
 import twisted.internet
 from twisted.internet import defer, protocol, task
 from twisted.trial.unittest import TestCase
 
-# pylint: disable=W0611
-from ubuntuone.devtools.testcases import skipIfOS
-# pylint: enable=W0611
 from ubuntuone.devtools.testcases.txsocketserver import (
     ServerTestCase,
     TidyTCPServer,
@@ -248,7 +239,6 @@
         class TestConnect(object):
             """A fake connection object."""
 
-            # pylint: disable=E0213
             @defer.inlineCallbacks
             def connect(my_self, factory):
                 """A fake connection."""
@@ -258,14 +248,12 @@
                 self.patch(factory, 'is_listening',
                         connected_factory.is_listening)
                 defer.returnValue(connected_factory)
-            # pylint: enable=E0213
 
         self.patch(tcpactivation, 'clientFromString',
                 lambda *args: TestConnect())
 
         yield server.listen_server(protocol.ServerFactory)
 
-        # pylint: disable=E1101
         ad = ActivationDetector(self.config)
         result = yield ad.is_already_running()
         self.assertTrue(result, "It should be already running.")
@@ -402,7 +390,6 @@
         description = yield ai.get_server_description()
         self.assertEqual(description, self.server_description)
 
-    #pylint:disable=W0201
     @defer.inlineCallbacks
     def test_get_description_fails_if_service_already_started(self):
         """The get_description method fails if service already started."""
@@ -412,7 +399,6 @@
         class TestConnect(object):
             """A fake connection object."""
 
-            # pylint: disable=E0213
             @defer.inlineCallbacks
             def connect(my_self, factory):
                 """A fake connection."""
@@ -422,7 +408,6 @@
                 self.patch(factory, 'is_listening',
                         connected_factory.is_listening)
                 defer.returnValue(connected_factory)
-            # pylint: enable=E0213
 
         self.patch(tcpactivation, 'clientFromString',
                 lambda *args: TestConnect())
@@ -432,7 +417,6 @@
         ai = ActivationInstance(self.config)
         yield self.assertFailure(ai.get_server_description(),
                                  AlreadyStartedError)
-    #pylint:enable=W0201
 
 
 def server_test(config):
@@ -445,7 +429,6 @@
 
         # start listening
         f = FakeServerFactory()
-        # pylint: disable=E1101
         reactor.listenTCP(description, f)
 
         # try to get the description again
@@ -454,7 +437,6 @@
     def already_started(failure):
         """This instance was already started."""
         print("already started!")
-        # pylint: disable=E1101
         reactor.callLater(3, reactor.stop)
 
     def get_description():
@@ -466,7 +448,6 @@
     print("starting the server.")
     ai = ActivationInstance(config)
     get_description()
-    # pylint: disable=E1101
     reactor.run()
 
 
@@ -483,7 +464,6 @@
         reactor.stop()
 
     d.addCallback(got_description)
-    # pylint: disable=E1101
     reactor.run()
 
 

=== modified file 'ubuntu_sso/utils/tests/test_ui.py'
--- ubuntu_sso/utils/tests/test_ui.py	2012-09-13 13:52:40 +0000
+++ ubuntu_sso/utils/tests/test_ui.py	2012-10-24 17:16:22 +0000
@@ -43,9 +43,9 @@
         """Test whether importing ui module defines _ as a builtin."""
         # This module is already imported above, but just to make sure, since
         # top imports may change over time.
-        import ubuntu_sso.utils.ui  # pylint: disable=W0612
-        with self.assertRaises(NameError):
-            _  # pylint: disable=W0104,E0602
+        import ubuntu_sso.utils.ui
+        assert(ubuntu_sso.utils.ui)
+        self.assertFalse('_' in __builtins__)
 
 
 class GetPasswordStrengTestCase(TestCase):

=== modified file 'ubuntu_sso/utils/webclient/__init__.py'
--- ubuntu_sso/utils/webclient/__init__.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/utils/webclient/__init__.py	2012-10-24 17:16:22 +0000
@@ -30,13 +30,6 @@
 
 import sys
 
-# pylint: disable=W0611
-from ubuntu_sso.utils.webclient.common import (
-    ProxyUnauthorizedError,
-    UnauthorizedError,
-    WebClientError,
-)
-
 
 def is_qt4reactor_installed():
     """Check if the qt4reactor is installed."""
@@ -62,11 +55,12 @@
 def webclient_module():
     """Choose the module of the web client."""
     if is_qt4reactor_installed():
-        from ubuntu_sso.utils.webclient import qtnetwork as web_module
+        from ubuntu_sso.utils.webclient import qtnetwork
+        return qtnetwork
     else:
-        from ubuntu_sso.utils.webclient import libsoup as web_module
+        from ubuntu_sso.utils.webclient import libsoup
         #from ubuntu_sso.utils.webclient import txweb as web_module
-    return web_module
+        return libsoup
 
 
 def webclient_factory(*args, **kwargs):

=== modified file 'ubuntu_sso/utils/webclient/tests/test_webclient.py'
--- ubuntu_sso/utils/webclient/tests/test_webclient.py	2012-06-29 20:57:01 +0000
+++ ubuntu_sso/utils/webclient/tests/test_webclient.py	2012-10-24 17:16:22 +0000
@@ -43,6 +43,7 @@
     from urlparse import urlparse, urljoin, parse_qsl
 
 from OpenSSL import crypto
+from oauth import oauth
 from socket import gethostname
 from twisted.cred import checkers, portal
 from twisted.internet import defer
@@ -65,7 +66,13 @@
 from ubuntu_sso.utils import webclient
 from ubuntu_sso.utils.ui import SSL_DETAILS_TEMPLATE
 from ubuntu_sso.utils.webclient import gsettings, txweb
-from ubuntu_sso.utils.webclient.common import BaseWebClient, HeaderDict, oauth
+from ubuntu_sso.utils.webclient.common import (
+    BaseWebClient,
+    HeaderDict,
+
+    UnauthorizedError,
+    WebClientError,
+)
 
 ANY_VALUE = object()
 SAMPLE_KEY = "result"
@@ -314,7 +321,7 @@
     def test_get_iri_error(self):
         """The errback is called when there's some error."""
         yield self.assertFailure(self.wc.request(self.base_iri + THROWERROR),
-                                 webclient.WebClientError)
+                                 WebClientError)
 
     @defer.inlineCallbacks
     def test_zero_byte_in_content(self):
@@ -345,7 +352,7 @@
     def test_unauthorized(self):
         """Detect when a request failed with the UNAUTHORIZED http code."""
         yield self.assertFailure(self.wc.request(self.base_iri + UNAUTHORIZED),
-                                 webclient.UnauthorizedError)
+                                 UnauthorizedError)
 
     @defer.inlineCallbacks
     def test_method_head(self):
@@ -377,7 +384,7 @@
                                           password="wrong password!")
         self.addCleanup(other_wc.shutdown)
         yield self.assertFailure(other_wc.request(self.base_iri + GUARDED),
-                                 webclient.UnauthorizedError)
+                                 UnauthorizedError)
 
     @defer.inlineCallbacks
     def test_request_is_oauth_signed(self):
@@ -418,7 +425,7 @@
     def test_webclienterror_not_string(self):
         """The returned exception contains unicode data."""
         deferred = self.wc.request(self.base_iri + THROWERROR)
-        failure = yield self.assertFailure(deferred, webclient.WebClientError)
+        failure = yield self.assertFailure(deferred, WebClientError)
         for error in failure.args:
             self.assertTrue(isinstance(error, basestring))
 
@@ -508,6 +515,7 @@
         fake_reactor = FakeSavingReactor()
         wc = txweb.WebClient(fake_reactor)
         _response = yield wc.request(iri)
+        assert(_response)
         host, _port, _args = fake_reactor.connections[0]
         self.assertEqual(host, self.FAKE_HOST)
 
@@ -681,7 +689,7 @@
 
         self.wc.force_use_proxy(partial_settings)
         self.failUnlessFailure(self.wc.request(self.base_iri + SIMPLERESOURCE),
-                               webclient.WebClientError)
+                               WebClientError)
 
     if WEBCLIENT_MODULE_NAME.endswith(".txweb"):
         reason = "txweb does not support proxies."
@@ -906,7 +914,7 @@
         self.spawn_return_code = Exception()
         self.failUnlessFailure(self.wc.request_proxy_auth_credentials(
                                          self.domain, True),
-                                         webclient.WebClientError)
+                                         WebClientError)
 
     @defer.inlineCallbacks
     def test_creds_acquired(self):
@@ -922,7 +930,7 @@
         self.keyring.creds = Exception()
         self.failUnlessFailure(self.wc.request_proxy_auth_credentials(
                                          self.domain, self.retry),
-                                         webclient.WebClientError)
+                                         WebClientError)
 
     @defer.inlineCallbacks
     def test_creds_none(self):
@@ -1071,7 +1079,7 @@
         # we fail due to the fake ssl cert
         yield self.failUnlessFailure(self.wc.request(
                                      self.base_iri + SIMPLERESOURCE),
-                                     webclient.WebClientError)
+                                     WebClientError)
         # https requests do not use the auth proxy therefore called should be
         # empty. This asserts that we are using the correct settings for the
         # request.
@@ -1160,7 +1168,7 @@
         """Test showing the dialog and rejecting."""
         self.failUnlessFailure(self.wc.request(
                                      self.base_iri + SIMPLERESOURCE),
-                                     webclient.WebClientError)
+                                     WebClientError)
         self.assertNotEqual(None, self.memento.check_error('SSL errors'))
 
     def test_format_ssl_details(self):