Merge lp:~laney/ubuntu-sso-client/pep8-fixes into lp:ubuntu-sso-client

[Iain Lane]

Fix errors introduced by new pep8

The new pep8 in Utopic makes ubuntu-sso-client fail its autopkgtests. Fix the new errors. :(

I'm going to upload this because the failure is (going to) blocking stuff from migrating. Feel free to overwrite it though.

[dobey (dobey)]

review: Approve

=== modified file 'setup.py'
--- setup.py	2013-09-19 20:40:41 +0000
+++ setup.py	2014-06-26 15:45:17 +0000
@@ -194,7 +194,7 @@
         replace_version()
         basepath = os.path.join('data', 'qt')
         # TODO: build the resource files so that we can include them
-        #self.build_rc(os.path.join(basepath, 'icons_rc.py'),
+        # self.build_rc(os.path.join(basepath, 'icons_rc.py'),
         #              os.path.join(os.path.dirname(__file__), 'icons'),
         #              '/icons')
         for dirpath, _, filenames in os.walk(basepath):

=== modified file 'ubuntu_sso/networkstate/windows.py'
--- ubuntu_sso/networkstate/windows.py	2012-10-30 22:05:34 +0000
+++ ubuntu_sso/networkstate/windows.py	2014-06-26 15:45:17 +0000
@@ -54,7 +54,7 @@
 # it clear for later developers.
 # pylint: disable=C0103
 
-## from EventSys.h
+# from EventSys.h
 PROGID_EventSystem = "EventSystem.EventSystem"
 PROGID_EventSubscription = "EventSystem.EventSubscription"
 

=== modified file 'ubuntu_sso/qt/email_verification_page.py'
--- ubuntu_sso/qt/email_verification_page.py	2012-12-04 19:28:44 +0000
+++ ubuntu_sso/qt/email_verification_page.py	2014-06-26 15:45:17 +0000
@@ -158,4 +158,4 @@
         self.next_button.setEnabled(False)
         self.wizard().setButtonLayout([QtGui.QWizard.Stretch])
 
-    #pylint: enable=C0103
+    # pylint: enable=C0103

=== modified file 'ubuntu_sso/qt/forgotten_password_page.py'
--- ubuntu_sso/qt/forgotten_password_page.py	2012-12-04 19:28:44 +0000
+++ ubuntu_sso/qt/forgotten_password_page.py	2014-06-26 15:45:17 +0000
@@ -72,7 +72,7 @@
         """Return the email address provided by the user."""
         return compat.text_type(self.ui.email_line_edit.text())
 
-    #pylint: disable=C0103
+    # pylint: disable=C0103
 
     def initializePage(self):
         """Set the initial state of ForgottenPassword page."""
@@ -81,7 +81,7 @@
         enabled = not self.ui.email_line_edit.text().isEmpty()
         self.ui.send_button.setEnabled(enabled)
 
-    #pylint: enable=C0103
+    # pylint: enable=C0103
 
     def _register_fields(self):
         """Register the fields of the wizard page."""

=== modified file 'ubuntu_sso/qt/tests/test_proxy_dialog.py'
--- ubuntu_sso/qt/tests/test_proxy_dialog.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/qt/tests/test_proxy_dialog.py	2014-06-26 15:45:17 +0000
@@ -65,14 +65,14 @@
     def setText(self, text):
         """Set the text of the widget."""
         self.internal_text = text
-        if not self.object_name in self.called:
+        if self.object_name not in self.called:
             self.called[self.object_name] = [('setText', text)]
         else:
             self.called[self.object_name].append(('setText', text))
 
     def text(self):
         """Return the text."""
-        if not self.object_name in self.called:
+        if self.object_name not in self.called:
             self.called[self.object_name] = [('text',)]
         else:
             self.called[self.object_name].append(('text',))
@@ -80,14 +80,14 @@
 
     def setPixmap(self, pixmap):
         """Set a pixmap."""
-        if not self.object_name in self.called:
+        if self.object_name not in self.called:
             self.called[self.object_name] = [('setPixmap', pixmap)]
         else:
             self.called[self.object_name].append(('setPixmap', pixmap))
 
     def setVisible(self, visible):
         """Set the ui element visible."""
-        if not self.object_name in self.called:
+        if self.object_name not in self.called:
             self.called[self.object_name] = [('setVisible', visible)]
         else:
             self.called[self.object_name].append(('setVisible', visible))

=== modified file 'ubuntu_sso/utils/runner/__init__.py'
--- ubuntu_sso/utils/runner/__init__.py	2012-08-30 11:08:49 +0000
+++ ubuntu_sso/utils/runner/__init__.py	2014-06-26 15:45:17 +0000
@@ -50,7 +50,7 @@
     """Check if the Qt4 main loop is installed."""
     result = False
 
-    if not 'PyQt4' in sys.modules:
+    if 'PyQt4' not in sys.modules:
         return result
 
     try:

=== modified file 'ubuntu_sso/utils/webclient/__init__.py'
--- ubuntu_sso/utils/webclient/__init__.py	2012-10-23 14:17:58 +0000
+++ ubuntu_sso/utils/webclient/__init__.py	2014-06-26 15:45:17 +0000
@@ -35,7 +35,7 @@
     """Check if the qt4reactor is installed."""
     result = False
 
-    if not 'PyQt4' in sys.modules:
+    if 'PyQt4' not in sys.modules:
         return result
 
     try:
@@ -59,7 +59,7 @@
         return qtnetwork
     else:
         from ubuntu_sso.utils.webclient import libsoup
-        #from ubuntu_sso.utils.webclient import txweb as web_module
+        # from ubuntu_sso.utils.webclient import txweb as web_module
         return libsoup
 
 

=== modified file 'ubuntu_sso/utils/webclient/tests/test_webclient.py'
--- ubuntu_sso/utils/webclient/tests/test_webclient.py	2013-04-12 20:09:12 +0000
+++ ubuntu_sso/utils/webclient/tests/test_webclient.py	2014-06-26 15:45:17 +0000
@@ -1005,7 +1005,7 @@
         # fake the gsettings to have diff settings for https and http
         http_settings = self.get_auth_proxy_settings()
 
-        #remember so that we can use them in the creds request
+        # remember so that we can use them in the creds request
         proxy_username = http_settings['username']
         proxy_password = http_settings['password']