Merge lp:~brian.curtin/ubuntu-sso-client/py3-exceptions into lp:ubuntu-sso-client

[Brian Curtin]

Use Python 3 style exception handling syntax.

Convert remaining usage of exception handling in the form "except Exception, e" to the format introduced in Python 3 and backported to 2.6, "except Exception as e". The latter format is already used almost everywhere in the codebase, but several places used the old format.

[Roberto Alsina (ralsina)]

review: Approve

[lp:~brian.curtin/ubuntu-sso-client/py3-exceptions]

973. By dobey on 2012-06-22

Remove the xdg_base_directory module as it duplicates dirspec now

[dobey (dobey)]

Can we have bugs for these py3 related issues?

review: Needs Information

[lp:~brian.curtin/ubuntu-sso-client/py3-exceptions]

974. By Brian Curtin on 2012-06-22

Merge bzr merge lp:~brian.curtin/ubuntu-sso-client/py3-exceptions

975. By Brian Curtin on 2012-06-22

Tag #1016711

[dobey (dobey)]

review: Approve

=== modified file 'ubuntu_sso/account.py'
--- ubuntu_sso/account.py	2012-06-22 16:55:35 +0000
+++ ubuntu_sso/account.py	2012-06-22 20:08:18 +0000
@@ -249,7 +249,7 @@
         try:
             operation = u"registration.request_password_reset_token"
             result = yield restful_client.restcall(operation, email=email)
-        except WebClientError, e:
+        except WebClientError as e:
             logger.exception('request_password_reset_token failed with:')
             raise ResetPasswordTokenError(e[1].split('\n')[0])
         finally:
@@ -275,7 +275,7 @@
                                         u"registration.set_new_password",
                                         email=email, token=token,
                                         new_password=new_password)
-        except WebClientError, e:
+        except WebClientError as e:
             logger.exception('set_new_password failed with:')
             raise NewPasswordError(e[1].split('\n')[0])
         finally:
 
=== modified file 'ubuntu_sso/networkstate/darwin.py'
--- ubuntu_sso/networkstate/darwin.py	2012-06-22 16:55:35 +0000
+++ ubuntu_sso/networkstate/darwin.py	2012-06-22 20:08:18 +0000
@@ -298,6 +298,6 @@
     """
     try:
         return defer.succeed(check_connected_state())
-    except Exception, e:                # pylint: disable=W0703
+    except Exception as e:                # pylint: disable=W0703
         logger.exception("Exception calling check_connected_state:")
         return defer.fail(NetworkFailException(e))
 
=== modified file 'ubuntu_sso/networkstate/linux.py'
--- ubuntu_sso/networkstate/linux.py	2012-06-22 16:55:35 +0000
+++ ubuntu_sso/networkstate/linux.py	2012-06-22 20:08:18 +0000
@@ -107,7 +107,7 @@
             nm_proxy.Get(NM_DBUS_INTERFACE, "State",
                          reply_handler=self.got_state,
                          error_handler=self.got_error)
-        except Exception, e:  # pylint: disable=W0703
+        except Exception as e:  # pylint: disable=W0703
             self.got_error(e)
 
 
@@ -127,7 +127,7 @@
     try:
         network = NetworkManagerState(got_state)
         network.find_online_state()
-    except Exception, e:
+    except Exception as e:
         logger.exception('is_machine_connected failed with:')
         d.errback(NetworkFailException(e))
     # pylint: enable=W0702, W0703
 
=== modified file 'ubuntu_sso/networkstate/windows.py'
--- ubuntu_sso/networkstate/windows.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/networkstate/windows.py	2012-06-22 20:08:18 +0000
@@ -184,7 +184,7 @@
         flags = DWORD()
         connected = wininet.InternetGetConnectedState(byref(flags), None)
         return defer.succeed(connected == 1)
-    except Exception, e:
+    except Exception as e:
         logger.exception('is_machine_connected failed with:')
         return defer.fail(NetworkFailException(e))
     # pylint: enable=W0703, W0702
 
=== modified file 'ubuntu_sso/qt/proxy_dialog.py'
--- ubuntu_sso/qt/proxy_dialog.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/qt/proxy_dialog.py	2012-06-22 20:08:18 +0000
@@ -116,7 +116,7 @@
         try:
             logger.debug('Save credentials as for domain %s.', self.domain)
             yield self.keyring.set_credentials(self.domain, creds)
-        except Exception, e:
+        except Exception as e:
             logger.exception('Could not set credentials:')
             self.done(EXCEPTION_RAISED)
         logger.debug('Stored creds')
 
=== modified file 'ubuntu_sso/utils/__init__.py'
--- ubuntu_sso/utils/__init__.py	2012-04-25 14:17:16 +0000
+++ ubuntu_sso/utils/__init__.py	2012-06-22 20:08:18 +0000
@@ -165,7 +165,7 @@
                 logger.debug("Calculated server-local time skew: %r",
                              self.skew)
             #pylint: disable=W0703
-            except Exception, server_error:
+            except Exception as server_error:
                 logger.debug("Error while verifying the server time skew: %r",
                              server_error)
                 self.next_check = local_time + self.ERROR_INTERVAL
 
=== modified file 'ubuntu_sso/utils/runner/glib.py'
--- ubuntu_sso/utils/runner/glib.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/utils/runner/glib.py	2012-06-22 20:08:18 +0000
@@ -89,7 +89,7 @@
 
     try:
         pid, _, _, _ = GLib.spawn_async(argv=bytes_args, flags=flags)
-    except GLib.GError, e:
+    except GLib.GError as e:
         handle_error(e)
     else:
         logger.debug('Spawning the program %r with the glib mainloop '
 
=== modified file 'ubuntu_sso/utils/runner/tests/test_glib.py'
--- ubuntu_sso/utils/runner/tests/test_glib.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/utils/runner/tests/test_glib.py	2012-06-22 20:08:18 +0000
@@ -87,7 +87,7 @@
 
         try:
             subprocess.call(argv)
-        except Exception, e:
+        except Exception as e:
             exc = GLib.GError()
             exc.message = str(e)
             exc.code = 42
 
=== modified file 'ubuntu_sso/utils/runner/tests/test_qt.py'
--- ubuntu_sso/utils/runner/tests/test_qt.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/utils/runner/tests/test_qt.py	2012-06-22 20:08:18 +0000
@@ -86,12 +86,12 @@
 
             try:
                 subprocess.call(bytes_args)
-            except OSError, e:
+            except OSError as e:
                 if e.errno == 2:
                     self.error.emit(self.FailedToStart)
                 else:
                     self.error.emit(e)
-            except Exception, e:
+            except Exception as e:
                 self.error.emit(e)
             else:
                 self.finished.emit(self._status_code)
 
=== modified file 'ubuntu_sso/utils/runner/tx.py'
--- ubuntu_sso/utils/runner/tx.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/utils/runner/tx.py	2012-06-22 20:08:18 +0000
@@ -102,9 +102,9 @@
 
     try:
         d = utils.getProcessOutputAndValue(program, bytes_args, env=os.environ)
-    except OSError, e:
+    except OSError as e:
         error_handler(msg=e, failed_to_start=True)
-    except Exception, e:
+    except Exception as e:
         error_handler(msg=e, failed_to_start=False)
     else:
         logger.debug('Spawning the program %r with the twisted reactor '
 
=== modified file 'ubuntu_sso/utils/txsecrets.py'
--- ubuntu_sso/utils/txsecrets.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/utils/txsecrets.py	2012-06-22 20:08:18 +0000
@@ -100,7 +100,7 @@
             self.service.OpenSession(ALGORITHM, parameters,
                                      reply_handler=session_opened,
                                      error_handler=d.errback)
-        except dbus.exceptions.DBusException, e:
+        except dbus.exceptions.DBusException as e:
             d.errback(e)
         return d
 
 
=== modified file 'ubuntu_sso/utils/webclient/common.py'
--- ubuntu_sso/utils/webclient/common.py	2012-04-12 12:07:46 +0000
+++ ubuntu_sso/utils/webclient/common.py	2012-06-22 20:08:18 +0000
@@ -206,7 +206,7 @@
         try:
             creds = yield keyring.get_credentials(str(domain))
             logger.debug('Got credentials from keyring.')
-        except Exception, e:
+        except Exception as e:
             logger.error('Error when retrieving the creds.')
             raise WebClientError('Error when retrieving the creds.', e)
         if creds is not None:
@@ -249,7 +249,7 @@
 
         try:
             return_code = yield self._launch_proxy_creds_dialog(domain, retry)
-        except Exception, e:
+        except Exception as e:
             logger.error('Error when running external ui process.')
             raise WebClientError('Error when running external ui process.', e)
 
 
=== modified file 'ubuntu_sso/utils/webclient/qtnetwork.py'
--- ubuntu_sso/utils/webclient/qtnetwork.py	2012-04-24 14:05:22 +0000
+++ ubuntu_sso/utils/webclient/qtnetwork.py	2012-06-22 20:08:18 +0000
@@ -165,7 +165,7 @@
         post_buffer.setData(post_content)
         try:
             result = yield self._perform_request(request, method, post_buffer)
-        except ProxyUnauthorizedError, e:
+        except ProxyUnauthorizedError as e:
             app_proxy = QNetworkProxy.applicationProxy()
             proxy_host = app_proxy.hostName() if app_proxy else "proxy server"
             got_creds = yield self.request_proxy_auth_credentials(
 
=== modified file 'ubuntu_sso/utils/webclient/timestamp.py'
--- ubuntu_sso/utils/webclient/timestamp.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/utils/webclient/timestamp.py	2012-06-22 20:08:18 +0000
@@ -83,7 +83,7 @@
                 logger.debug("Calculated server time skew: %r", self.skew)
             # We just log all exceptions while trying to get the server time
             # pylint: disable=W0703
-            except Exception, e:
+            except Exception as e:
                 logger.debug("Error while verifying server time skew: %r", e)
                 self.next_check = local_time + self.ERROR_INTERVAL
         # delay import, otherwise a default reactor gets installed