Ubuntu Single Sign On Client

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

  1. pep8-fixes
  2. Merge into trunk
Proposed by Iain Lane
Status: Merged
Approved by: dobey
Approved revision: 1036
Merged at revision: 1037
Proposed branch: lp:~laney/ubuntu-sso-client/pep8-fixes
Merge into: lp:ubuntu-sso-client
Diff against target: 142 lines (+13/-13)
8 files modified
setup.py (+1/-1)
ubuntu_sso/networkstate/windows.py (+1/-1)
ubuntu_sso/qt/email_verification_page.py (+1/-1)
ubuntu_sso/qt/forgotten_password_page.py (+2/-2)
ubuntu_sso/qt/tests/test_proxy_dialog.py (+4/-4)
ubuntu_sso/utils/runner/__init__.py (+1/-1)
ubuntu_sso/utils/webclient/__init__.py (+2/-2)
ubuntu_sso/utils/webclient/tests/test_webclient.py (+1/-1)
To merge this branch: bzr merge lp:~laney/ubuntu-sso-client/pep8-fixes
Reviewer Review Type Date Requested Status
dobey (community) Approve
Review via email: mp+224665@code.launchpad.net

Commit message

Fix errors introduced by new pep8

Description of the change

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.

To post a comment you must log in.
Revision history for this message
dobey (dobey) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
194 replace_version()194 replace_version()
195 basepath = os.path.join('data', 'qt')195 basepath = os.path.join('data', 'qt')
196 # TODO: build the resource files so that we can include them196 # TODO: build the resource files so that we can include them
197 #self.build_rc(os.path.join(basepath, 'icons_rc.py'),197 # self.build_rc(os.path.join(basepath, 'icons_rc.py'),
198 # os.path.join(os.path.dirname(__file__), 'icons'),198 # os.path.join(os.path.dirname(__file__), 'icons'),
199 # '/icons')199 # '/icons')
200 for dirpath, _, filenames in os.walk(basepath):200 for dirpath, _, filenames in os.walk(basepath):
201201
=== 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 @@
54# it clear for later developers.54# it clear for later developers.
55# pylint: disable=C010355# pylint: disable=C0103
5656
57## from EventSys.h57# from EventSys.h
58PROGID_EventSystem = "EventSystem.EventSystem"58PROGID_EventSystem = "EventSystem.EventSystem"
59PROGID_EventSubscription = "EventSystem.EventSubscription"59PROGID_EventSubscription = "EventSystem.EventSubscription"
6060
6161
=== 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 @@
158 self.next_button.setEnabled(False)158 self.next_button.setEnabled(False)
159 self.wizard().setButtonLayout([QtGui.QWizard.Stretch])159 self.wizard().setButtonLayout([QtGui.QWizard.Stretch])
160160
161 #pylint: enable=C0103161 # pylint: enable=C0103
162162
=== 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 @@
72 """Return the email address provided by the user."""72 """Return the email address provided by the user."""
73 return compat.text_type(self.ui.email_line_edit.text())73 return compat.text_type(self.ui.email_line_edit.text())
7474
75 #pylint: disable=C010375 # pylint: disable=C0103
7676
77 def initializePage(self):77 def initializePage(self):
78 """Set the initial state of ForgottenPassword page."""78 """Set the initial state of ForgottenPassword page."""
@@ -81,7 +81,7 @@
81 enabled = not self.ui.email_line_edit.text().isEmpty()81 enabled = not self.ui.email_line_edit.text().isEmpty()
82 self.ui.send_button.setEnabled(enabled)82 self.ui.send_button.setEnabled(enabled)
8383
84 #pylint: enable=C010384 # pylint: enable=C0103
8585
86 def _register_fields(self):86 def _register_fields(self):
87 """Register the fields of the wizard page."""87 """Register the fields of the wizard page."""
8888
=== 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 @@
65 def setText(self, text):65 def setText(self, text):
66 """Set the text of the widget."""66 """Set the text of the widget."""
67 self.internal_text = text67 self.internal_text = text
68 if not self.object_name in self.called:68 if self.object_name not in self.called:
69 self.called[self.object_name] = [('setText', text)]69 self.called[self.object_name] = [('setText', text)]
70 else:70 else:
71 self.called[self.object_name].append(('setText', text))71 self.called[self.object_name].append(('setText', text))
7272
73 def text(self):73 def text(self):
74 """Return the text."""74 """Return the text."""
75 if not self.object_name in self.called:75 if self.object_name not in self.called:
76 self.called[self.object_name] = [('text',)]76 self.called[self.object_name] = [('text',)]
77 else:77 else:
78 self.called[self.object_name].append(('text',))78 self.called[self.object_name].append(('text',))
@@ -80,14 +80,14 @@
8080
81 def setPixmap(self, pixmap):81 def setPixmap(self, pixmap):
82 """Set a pixmap."""82 """Set a pixmap."""
83 if not self.object_name in self.called:83 if self.object_name not in self.called:
84 self.called[self.object_name] = [('setPixmap', pixmap)]84 self.called[self.object_name] = [('setPixmap', pixmap)]
85 else:85 else:
86 self.called[self.object_name].append(('setPixmap', pixmap))86 self.called[self.object_name].append(('setPixmap', pixmap))
8787
88 def setVisible(self, visible):88 def setVisible(self, visible):
89 """Set the ui element visible."""89 """Set the ui element visible."""
90 if not self.object_name in self.called:90 if self.object_name not in self.called:
91 self.called[self.object_name] = [('setVisible', visible)]91 self.called[self.object_name] = [('setVisible', visible)]
92 else:92 else:
93 self.called[self.object_name].append(('setVisible', visible))93 self.called[self.object_name].append(('setVisible', visible))
9494
=== 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 @@
50 """Check if the Qt4 main loop is installed."""50 """Check if the Qt4 main loop is installed."""
51 result = False51 result = False
5252
53 if not 'PyQt4' in sys.modules:53 if 'PyQt4' not in sys.modules:
54 return result54 return result
5555
56 try:56 try:
5757
=== 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 @@
35 """Check if the qt4reactor is installed."""35 """Check if the qt4reactor is installed."""
36 result = False36 result = False
3737
38 if not 'PyQt4' in sys.modules:38 if 'PyQt4' not in sys.modules:
39 return result39 return result
4040
41 try:41 try:
@@ -59,7 +59,7 @@
59 return qtnetwork59 return qtnetwork
60 else:60 else:
61 from ubuntu_sso.utils.webclient import libsoup61 from ubuntu_sso.utils.webclient import libsoup
62 #from ubuntu_sso.utils.webclient import txweb as web_module62 # from ubuntu_sso.utils.webclient import txweb as web_module
63 return libsoup63 return libsoup
6464
6565
6666
=== 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 @@
1005 # fake the gsettings to have diff settings for https and http1005 # fake the gsettings to have diff settings for https and http
1006 http_settings = self.get_auth_proxy_settings()1006 http_settings = self.get_auth_proxy_settings()
10071007
1008 #remember so that we can use them in the creds request1008 # remember so that we can use them in the creds request
1009 proxy_username = http_settings['username']1009 proxy_username = http_settings['username']
1010 proxy_password = http_settings['password']1010 proxy_password = http_settings['password']
10111011

Subscribers

People subscribed via source and target branches