From a9851247317b25aa6ebcb19b1d36adf35cb3b7ad Mon Sep 17 00:00:00 2001
From: Patrick Uiterwijk <puiterwijk@redhat.com>
Date: May 04 2017 23:41:05 +0000
Subject: Migrate all except statements to new syntax


This migration is fully automated by: 2to3 -f except -wn . ipsilon/install/*

Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>

---

diff --git a/ipsilon/admin/common.py b/ipsilon/admin/common.py
index fe41a5a..f69d11f 100644
--- a/ipsilon/admin/common.py
+++ b/ipsilon/admin/common.py
@@ -179,7 +179,7 @@ class AdminPluginsOrder(AdminPage):
                         if cur_enabled[i] != new_order[i]:
                             changed[cur_enabled[i]] = 'reordered'
 
-                except ValueError, e:
+                except ValueError as e:
                     message = str(e)
                     message_type = ADMIN_STATUS_ERROR
 
@@ -260,7 +260,7 @@ class AdminPlugins(AdminPage):
         msg = None
         try:
             obj = self._get_plugin_obj(plugin)
-        except AdminError, e:
+        except AdminError as e:
             return self.root_with_msg(str(e), ADMIN_STATUS_WARN)
         if not obj.is_enabled:
             try:
@@ -278,7 +278,7 @@ class AdminPlugins(AdminPage):
         msg = None
         try:
             obj = self._get_plugin_obj(plugin)
-        except AdminError, e:
+        except AdminError as e:
             return self.root_with_msg(str(e), ADMIN_STATUS_WARN)
         if obj.is_enabled:
             try:
diff --git a/ipsilon/helpers/ipa.py b/ipsilon/helpers/ipa.py
index 5fc0c82..8111eb8 100644
--- a/ipsilon/helpers/ipa.py
+++ b/ipsilon/helpers/ipa.py
@@ -62,7 +62,7 @@ class Installer(EnvHelpersInstaller):
             self.domain = ipaconfig.config.get_domain()
             self.server = ipaconfig.config.get_server()
 
-        except Exception, e:  # pylint: disable=broad-except
+        except Exception as e:  # pylint: disable=broad-except
             logger.info('IPA tools installation found: [%s]', e)
             if opts['ipa'] == 'yes':
                 raise Exception('No IPA installation found!')
diff --git a/ipsilon/info/infoldap.py b/ipsilon/info/infoldap.py
index 6466d30..c4b4888 100644
--- a/ipsilon/info/infoldap.py
+++ b/ipsilon/info/infoldap.py
@@ -149,7 +149,7 @@ Info plugin that uses LDAP to retrieve user data. """
             reply = userattrs
             reply['_groups'] = groups
             reply['_extras'] = {'ldap': extras}
-        except Exception, e:  # pylint: disable=broad-except
+        except Exception as e:  # pylint: disable=broad-except
             self.error('Error fetching/mapping LDAP user data: %s' % e)
 
         return reply
diff --git a/ipsilon/install/ipsilon-client-install b/ipsilon/install/ipsilon-client-install
index c73b76c..101c3cb 100755
--- a/ipsilon/install/ipsilon-client-install
+++ b/ipsilon/install/ipsilon-client-install
@@ -67,7 +67,7 @@ def saml2():
             r = requests.get(args['saml_idp_metadata'])
             r.raise_for_status()
             idpmeta = r.content
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         logger.error("Failed to retrieve IDP Metadata file!\n" +
                      "Error: [%s]" % repr(e))
         raise
@@ -270,13 +270,13 @@ def saml2_uninstall():
     if os.path.exists(path):
         try:
             shutil.rmtree(path)
-        except Exception, e:  # pylint: disable=broad-except
+        except Exception as e:  # pylint: disable=broad-except
             log_exception(e)
 
     if os.path.exists(CONFFILE % 'saml'):
         try:
             os.remove(CONFFILE % 'saml')
-        except Exception, e:  # pylint: disable=broad-except
+        except Exception as e:  # pylint: disable=broad-except
             log_exception(e)
 
 
@@ -383,7 +383,7 @@ def openidc():
         r = requests.get(discovery_url, **requests_args)
         r.raise_for_status()
         discovered_info = r.json()
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         logger.error("Failed to retrieve IdP configuration!\n" +
                      "Error: [%s]" % repr(e))
         raise
@@ -417,7 +417,7 @@ def openidc():
                           json=client_info, **requests_args)
         r.raise_for_status()
         registration_response = r.json()
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         logger.error("Failed to register with the IdP!\n" +
                      "Error: [%s]" % repr(e))
         raise
@@ -589,7 +589,7 @@ if __name__ == '__main__':
                 saml2()
             elif service_type == 'openidc':
                 openidc()
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         log_exception(e)
         if 'uninstall' in args and args['uninstall'] is True:
             logging.info('Uninstallation aborted.')
diff --git a/ipsilon/install/ipsilon-server-install b/ipsilon/install/ipsilon-server-install
index 1aff672..1a4efcb 100755
--- a/ipsilon/install/ipsilon-server-install
+++ b/ipsilon/install/ipsilon-server-install
@@ -60,7 +60,7 @@ def openlogs():
     logger = logging.getLogger()
     try:
         lh = logging.FileHandler(LOGFILE)
-    except IOError, e:
+    except IOError as e:
         sys.exit('Unable to open %s (%s)' % (LOGFILE, str(e)))
     formatter = logging.Formatter('[%(asctime)s] %(message)s')
     lh.setFormatter(formatter)
@@ -524,7 +524,7 @@ if __name__ == '__main__':
             uninstall(fplugins, opts)
         else:
             install(fplugins, opts)
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         logger.info(str(e))         # emit message to console
         logger.debug(e, exc_info=1) # add backtrace information to logfile
 
diff --git a/ipsilon/login/authfas.py b/ipsilon/login/authfas.py
index 6bb5694..94b0ca7 100644
--- a/ipsilon/login/authfas.py
+++ b/ipsilon/login/authfas.py
@@ -26,10 +26,10 @@ class FAS(LoginFormBase):
             data = None
             try:
                 _, data = self.lm.fpc.login(username, password)
-            except AuthError, e:
+            except AuthError as e:
                 cherrypy.log.error("Authentication error [%s]" % str(e),
                                    severity=logging.ERROR)
-            except Exception, e:  # pylint: disable=broad-except
+            except Exception as e:  # pylint: disable=broad-except
                 cherrypy.log.error("Unknown Error [%s]" % str(e),
                                    severity=logging.ERROR)
 
diff --git a/ipsilon/providers/openid/auth.py b/ipsilon/providers/openid/auth.py
index 51d44e0..8bd907a 100644
--- a/ipsilon/providers/openid/auth.py
+++ b/ipsilon/providers/openid/auth.py
@@ -30,7 +30,7 @@ class AuthenticateRequest(ProviderPageBase):
                     self.trans.cookie.value != self.trans.provider):
                 self.debug('Invalid transaction, %s != %s' % (
                            self.trans.cookie.value, self.trans.provider))
-        except Exception, e:  # pylint: disable=broad-except
+        except Exception as e:  # pylint: disable=broad-except
             self.debug('Transaction initialization failed: %s' % repr(e))
             raise cherrypy.HTTPError(400, 'Invalid transaction id')
 
@@ -55,9 +55,9 @@ class AuthenticateRequest(ProviderPageBase):
         try:
             request = self._parse_request(**kwargs)
             return self._openid_checks(request, form, **kwargs)
-        except InvalidRequest, e:
+        except InvalidRequest as e:
             raise cherrypy.HTTPError(e.code, e.message)
-        except UnauthorizedRequest, e:
+        except UnauthorizedRequest as e:
             if request is None:
                 raise cherrypy.HTTPError(e.code, e.message)
             return self._respond(request.answer(False))
@@ -79,7 +79,7 @@ class AuthenticateRequest(ProviderPageBase):
         request = None
         try:
             request = self.cfg.server.decodeRequest(kwargs)
-        except ProtocolError, openid_error:
+        except ProtocolError as openid_error:
             self.debug('ProtocolError: %s' % openid_error)
             raise InvalidRequest('Invalid OpenID request')
 
@@ -241,7 +241,7 @@ class AuthenticateRequest(ProviderPageBase):
             cherrypy.response.headers.update(webresponse.headers)
             cherrypy.response.status = webresponse.code
             return webresponse.body
-        except EncodingError, encoding_error:
+        except EncodingError as encoding_error:
             self.debug('Unable to respond because: %s' % encoding_error)
             cherrypy.response.headers = {
                 'Content-Type': 'text/plain; charset=UTF-8'
diff --git a/ipsilon/providers/openidc/auth.py b/ipsilon/providers/openidc/auth.py
index a52a730..ac94196 100644
--- a/ipsilon/providers/openidc/auth.py
+++ b/ipsilon/providers/openidc/auth.py
@@ -41,7 +41,7 @@ class AuthenticateRequest(ProviderPageBase):
                     self.trans.cookie.value != self.trans.provider):
                 self.debug('Invalid transaction, %s != %s' % (
                            self.trans.cookie.value, self.trans.provider))
-        except Exception, e:  # pylint: disable=broad-except
+        except Exception as e:  # pylint: disable=broad-except
             self.debug('Transaction initialization failed: %s' % repr(e))
             raise cherrypy.HTTPError(400, 'Invalid transaction id')
 
@@ -319,7 +319,7 @@ class Authorization(AuthenticateRequest):
         # Build the "claims" values from scopes
         try:
             request_data['claims'] = json.loads(request_data['claims'])
-        except Exception, ex:  # pylint: disable=broad-except
+        except Exception as ex:  # pylint: disable=broad-except
             return self._respond_error(request_data,
                                        'invalid_request',
                                        'claims malformed: %s' % ex)
diff --git a/ipsilon/providers/personaidp.py b/ipsilon/providers/personaidp.py
index f44f701..6e8216d 100644
--- a/ipsilon/providers/personaidp.py
+++ b/ipsilon/providers/personaidp.py
@@ -65,7 +65,7 @@ Provides Persona authentication infrastructure. """
         try:
             self.key = M2Crypto.RSA.load_key(self.idp_key_file,
                                              lambda *args: None)
-        except Exception, e:  # pylint: disable=broad-except
+        except Exception as e:  # pylint: disable=broad-except
             self.debug('Failed to init Persona provider: %r' % e)
             return None
 
diff --git a/ipsilon/providers/saml2/admin.py b/ipsilon/providers/saml2/admin.py
index 133f647..e9126e0 100644
--- a/ipsilon/providers/saml2/admin.py
+++ b/ipsilon/providers/saml2/admin.py
@@ -101,7 +101,7 @@ class NewSPAdminPage(AdminPage):
                             r = requests.get(value)
                             r.raise_for_status()
                             meta = r.content
-                        except Exception, e:  # pylint: disable=broad-except
+                        except Exception as e:  # pylint: disable=broad-except
                             self.debug("Failed to fetch metadata: " + repr(e))
                             message = "Failed to fetch metadata: " + repr(e)
                             message_type = ADMIN_STATUS_ERROR
@@ -116,10 +116,10 @@ class NewSPAdminPage(AdminPage):
                     message = "SP Successfully added"
                     message_type = ADMIN_STATUS_OK
                     return sp_page.root_with_msg(message, message_type)
-                except InvalidProviderId, e:
+                except InvalidProviderId as e:
                     message = str(e)
                     message_type = ADMIN_STATUS_ERROR
-                except Exception, e:  # pylint: disable=broad-except
+                except Exception as e:  # pylint: disable=broad-except
                     self.debug(repr(e))
                     message = "Failed to create Service Provider!"
                     message_type = ADMIN_STATUS_ERROR
@@ -284,15 +284,15 @@ class SPAdminPage(AdminPage):
                         validate_sp_metadata(value)
                         self.sp.metadata = value
 
-            except InvalidProviderMetadata, e:
+            except InvalidProviderMetadata as e:
                 message = str(e)
                 message_type = ADMIN_STATUS_WARN
                 return self.root_with_msg(message, message_type)
-            except InvalidValueFormat, e:
+            except InvalidValueFormat as e:
                 message = str(e)
                 message_type = ADMIN_STATUS_WARN
                 return self.root_with_msg(message, message_type)
-            except UnauthorizedUser, e:
+            except UnauthorizedUser as e:
                 message = str(e)
                 message_type = ADMIN_STATUS_ERROR
                 return self.root_with_msg(message, message_type)
@@ -352,7 +352,7 @@ class Saml2AdminPage(AdminPage):
             page = getattr(self.sp, name)
             self.providers.remove(page.sp)
             self.sp.del_subtree(name)
-        except Exception, e:  # pylint: disable=broad-except
+        except Exception as e:  # pylint: disable=broad-except
             self.debug("Failed to remove provider %s: %s" % (name, str(e)))
 
     def add_sps(self):
@@ -362,7 +362,7 @@ class Saml2AdminPage(AdminPage):
                     sp = ServiceProvider(self.cfg, p)
                     self.del_sp(sp.name)
                     self.add_sp(sp.name, sp)
-                except Exception, e:  # pylint: disable=broad-except
+                except Exception as e:  # pylint: disable=broad-except
                     self.debug("Failed to find provider %s: %s" % (p, str(e)))
 
     def mount(self, page):
diff --git a/ipsilon/providers/saml2/auth.py b/ipsilon/providers/saml2/auth.py
index 1d16091..ba30060 100644
--- a/ipsilon/providers/saml2/auth.py
+++ b/ipsilon/providers/saml2/auth.py
@@ -53,7 +53,7 @@ class AuthenticateRequest(ProviderPageBase):
                 if self.trans.cookie.value != self.trans.provider:
                     self.debug('Invalid transaction, %s != %s' % (
                         self.trans.cookie.value, self.trans.provider))
-        except Exception, e:  # pylint: disable=broad-except
+        except Exception as e:  # pylint: disable=broad-except
             self.debug('Transaction initialization failed: %s' % repr(e))
             raise cherrypy.HTTPError(400, 'Invalid transaction id')
 
@@ -66,7 +66,7 @@ class AuthenticateRequest(ProviderPageBase):
     def auth(self, login):
         try:
             self.saml2checks(login)
-        except AuthenticationError, e:
+        except AuthenticationError as e:
             self.saml2error(login, e.code, e.message)
         return self.reply(login)
 
@@ -93,20 +93,20 @@ class AuthenticateRequest(ProviderPageBase):
             )
             raise InvalidRequest(msg)
         except (lasso.ProfileInvalidMsgError,
-                lasso.ProfileMissingIssuerError), e:
+                lasso.ProfileMissingIssuerError) as e:
 
             msg = 'Malformed Request %r [%r]' % (e, message)
             raise InvalidRequest(msg)
 
         except (lasso.ProfileInvalidProtocolprofileError,
-                lasso.DsError), e:
+                lasso.DsError) as e:
 
             msg = 'Invalid SAML Request: %r (%r [%r])' % (login.request,
                                                           e, message)
             raise InvalidRequest(msg)
 
         except (lasso.ServerProviderNotFoundError,
-                lasso.ProfileUnknownProviderError), e:
+                lasso.ProfileUnknownProviderError) as e:
 
             msg = 'Invalid SP [%s] (%r [%r])' % (login.remoteProviderId,
                                                  e, message)
@@ -160,19 +160,19 @@ class AuthenticateRequest(ProviderPageBase):
                 login = self._idp_initiated_login(spidentifier, relaystate)
             except lasso.ServerProviderNotFoundError:
                 raise cherrypy.HTTPError(400, 'Unknown Service Provider')
-            except Exception, e:  # pylint: disable=broad-except
+            except Exception as e:  # pylint: disable=broad-except
                 self.debug(str(e))
                 raise cherrypy.HTTPError(500)
         else:
             try:
                 login = self._parse_request(request)
-            except InvalidRequest, e:
+            except InvalidRequest as e:
                 self.debug(str(e))
                 raise cherrypy.HTTPError(400, 'Invalid SAML request token')
-            except UnknownProvider, e:
+            except UnknownProvider as e:
                 self.debug(str(e))
                 raise cherrypy.HTTPError(400, 'Unknown Service Provider')
-            except Exception, e:  # pylint: disable=broad-except
+            except Exception as e:  # pylint: disable=broad-except
                 self.debug(str(e))
                 raise cherrypy.HTTPError(500)
 
@@ -213,10 +213,10 @@ class AuthenticateRequest(ProviderPageBase):
         try:
             provider = ServiceProvider(self.cfg, login.remoteProviderId)
             nameidfmt = provider.get_valid_nameid(login.request.nameIdPolicy)
-        except NameIdNotAllowed, e:
+        except NameIdNotAllowed as e:
             raise AuthenticationError(
                 str(e), lasso.SAML2_STATUS_CODE_INVALID_NAME_ID_POLICY)
-        except InvalidProviderId, e:
+        except InvalidProviderId as e:
             raise AuthenticationError(
                 str(e), lasso.SAML2_STATUS_CODE_AUTHN_FAILED)
 
diff --git a/ipsilon/providers/saml2/logout.py b/ipsilon/providers/saml2/logout.py
index e31ce91..74ce37f 100644
--- a/ipsilon/providers/saml2/logout.py
+++ b/ipsilon/providers/saml2/logout.py
@@ -79,7 +79,7 @@ class LogoutRequest(ProviderPageBase):
 
         try:
             logout.validateRequest()
-        except lasso.ProfileSessionNotFoundError, e:
+        except lasso.ProfileSessionNotFoundError as e:
             self.error('Logout failed. No sessions for %s' %
                        logout.remoteProviderId)
             return self._not_logged_in(logout, message)
@@ -87,7 +87,7 @@ class LogoutRequest(ProviderPageBase):
             self.error('Logout failed. Unsupported profile %s' %
                        logout.remoteProviderId)
             raise cherrypy.HTTPError(400, 'Profile does not support logout')
-        except lasso.Error, e:
+        except lasso.Error as e:
             self.error('SLO validation failed: %s' % e)
             raise cherrypy.HTTPError(400, 'Failed to validate logout request')
 
@@ -96,7 +96,7 @@ class LogoutRequest(ProviderPageBase):
         except lasso.ProfileUnsupportedProfileError:
             self.error('Unsupported profile for %s' % logout.remoteProviderId)
             raise cherrypy.HTTPError(400, 'Profile does not support logout')
-        except lasso.Error, e:
+        except lasso.Error as e:
             self.error('SLO failed to build logout response: %s' % e)
 
         for ind in session_indexes:
@@ -184,12 +184,12 @@ class LogoutRequest(ProviderPageBase):
             self.error(msg)
             raise UnknownProvider(msg)
         except (lasso.ProfileInvalidProtocolprofileError,
-                lasso.DsError), e:
+                lasso.DsError) as e:
             msg = 'Invalid SAML Request: %r (%r [%r])' % (logout.request,
                                                           e, message)
             self.error(msg)
             raise InvalidRequest(msg)
-        except lasso.Error, e:
+        except lasso.Error as e:
             self.error('SLO unknown error: %s' % message)
             raise cherrypy.HTTPError(400, 'Invalid logout request')
 
@@ -307,7 +307,7 @@ class LogoutRequest(ProviderPageBase):
 
             try:
                 logout.buildRequestMsg()
-            except lasso.Error, e:
+            except lasso.Error as e:
                 self.error('failure to build logout request msg: %s' % e)
                 raise cherrypy.HTTPRedirect(400, 'Failed to log out user: %s '
                                             % e)
diff --git a/ipsilon/providers/saml2/rest.py b/ipsilon/providers/saml2/rest.py
index 7ef5576..d4d97fe 100644
--- a/ipsilon/providers/saml2/rest.py
+++ b/ipsilon/providers/saml2/rest.py
@@ -106,7 +106,7 @@ class SPS(RestProviderBase):
         except (InvalidProviderId, ServerAddProviderFailedError) as e:
             self.debug(repr(e))
             return rest_error(400, str(e))
-        except Exception, e:  # pylint: disable=broad-except
+        except Exception as e:  # pylint: disable=broad-except
             self.debug(repr(e))
             return rest_error(500, "Failed to create Service Provider")
 
diff --git a/ipsilon/providers/saml2idp.py b/ipsilon/providers/saml2idp.py
index 507644e..09bb12a 100644
--- a/ipsilon/providers/saml2idp.py
+++ b/ipsilon/providers/saml2idp.py
@@ -127,7 +127,7 @@ class Continue(AuthenticateRequest):
 
         try:
             login = self.cfg.idp.get_login_handler(dump)
-        except Exception, e:  # pylint: disable=broad-except
+        except Exception as e:  # pylint: disable=broad-except
             self.error('Failed to load login status from dump: %r' % e)
 
         if not login:
@@ -366,7 +366,7 @@ Provides SAML 2.0 authentication infrastructure. """
         try:
             idp = IdentityProvider(self,
                                    sessionfactory=self.sessionfactory)
-        except Exception, e:  # pylint: disable=broad-except
+        except Exception as e:  # pylint: disable=broad-except
             self.error('Failed to init SAML2 provider: %r' % e)
             return None
 
@@ -382,7 +382,7 @@ Provides SAML 2.0 authentication infrastructure. """
                 continue
             try:
                 idp.add_provider(sp)
-            except Exception, e:  # pylint: disable=broad-except
+            except Exception as e:  # pylint: disable=broad-except
                 self.error('Failed to add SP %s: %r' % (sp['name'], e))
 
         return idp
@@ -433,7 +433,7 @@ Provides SAML 2.0 authentication infrastructure. """
             return self.idp_initiated_logout()
         try:
             logout.buildRequestMsg()
-        except lasso.Error, e:
+        except lasso.Error as e:
             self.error('failure to build logout request msg: %s' % e)
             raise cherrypy.HTTPRedirect(400, 'Failed to log out user: %s '
                                         % e)
diff --git a/ipsilon/util/data.py b/ipsilon/util/data.py
index 5266a85..0eb01b5 100644
--- a/ipsilon/util/data.py
+++ b/ipsilon/util/data.py
@@ -286,7 +286,7 @@ class FileStore(BaseStore):
     def get_config(self):
         try:
             stat = os.stat(self._filename)
-        except OSError, e:
+        except OSError as e:
             self.error("Unable to check config file %s: [%s]" % (
                 self._filename, e))
             self._config = None
@@ -922,7 +922,7 @@ class Store(Log):
         with q:
             try:
                 rows = q.select(kvfilter)
-            except Exception, e:  # pylint: disable=broad-except
+            except Exception as e:  # pylint: disable=broad-except
                 self.error("Failed to load data for table %s for store %s:[%s]"
                            % (table, self.__class__.__name__, e))
         return self._rows_to_dict_tree(rows)
@@ -961,7 +961,7 @@ class Store(Log):
                     if opt not in options:
                         q.delete({'name': name, 'option': opt})
 
-            except Exception, e:  # pylint: disable=broad-except
+            except Exception as e:  # pylint: disable=broad-except
                 self.error("Failed to save options: [%s]" % e)
                 raise
 
@@ -976,7 +976,7 @@ class Store(Log):
                     for opt in options:
                         kvfilter['option'] = opt
                         q.delete(kvfilter)
-            except Exception, e:  # pylint: disable=broad-except
+            except Exception as e:  # pylint: disable=broad-except
                 self.error("Failed to delete from %s: [%s]" % (table, e))
                 raise
 
@@ -996,7 +996,7 @@ class Store(Log):
                     q.insert((newid, name, data[name]), ttl)
                 if expiration_time:
                     q.insert((newid, 'expiration_time', expiration_time), ttl)
-            except Exception, e:  # pylint: disable=broad-except
+            except Exception as e:  # pylint: disable=broad-except
                 self.error("Failed to store %s data: [%s]" % (table, e))
                 raise
         return newid
@@ -1042,7 +1042,7 @@ class Store(Log):
                             if datum[name] is not None:
                                 q.insert((uid, name, datum[name]), ttl)
 
-            except Exception, e:  # pylint: disable=broad-except
+            except Exception as e:  # pylint: disable=broad-except
                 self.error("Failed to store data in %s: [%s]" % (table, e))
                 raise
 
@@ -1052,7 +1052,7 @@ class Store(Log):
         with q:
             try:
                 q.delete(kvfilter)
-            except Exception, e:  # pylint: disable=broad-except
+            except Exception as e:  # pylint: disable=broad-except
                 self.error("Failed to delete data from %s: [%s]" % (table, e))
 
     def _reset_data(self, table):
@@ -1061,7 +1061,7 @@ class Store(Log):
             try:
                 q.drop()
                 q.create()
-            except Exception, e:  # pylint: disable=broad-except
+            except Exception as e:  # pylint: disable=broad-except
                 if q:
                     q.rollback()
                 self.error("Failed to erase all data from %s: [%s]"
@@ -1169,7 +1169,7 @@ class UserStore(Store):
                                                      'option': key})
                 else:
                     q.insert((user, key, parameters))
-            except Exception, e:  # pylint: disable=broad-except
+            except Exception as e:  # pylint: disable=broad-except
                 self.error('Failed to store consent: [%s]' % e)
                 raise
 
@@ -1179,7 +1179,7 @@ class UserStore(Store):
             try:
                 q.delete({'name': user,
                           'option': self._cons_key(provider, clientid)})
-            except Exception, e:  # pylint: disable=broad-except
+            except Exception as e:  # pylint: disable=broad-except
                 self.error('Failed to delete consent: [%s]' % e)
                 raise
 
@@ -1195,7 +1195,7 @@ class UserStore(Store):
                     return data[0][0]
                 else:
                     return None
-            except Exception, e:  # pylint: disable=broad-except
+            except Exception as e:  # pylint: disable=broad-except
                 self.error('Failed to get consent: [%s]' % e)
                 raise
 
@@ -1208,7 +1208,7 @@ class UserStore(Store):
                 for r in rows:
                     prov, clientid = self._split_cons_key(r[0])
                     d.append((prov, clientid, r[1]))
-            except Exception, e:  # pylint: disable=broad-except
+            except Exception as e:  # pylint: disable=broad-except
                 self.error('Failed to get consents: [%s]' % e)
                 raise
         return d
diff --git a/ipsilon/util/plugin.py b/ipsilon/util/plugin.py
index 2b49c82..4b28f9a 100644
--- a/ipsilon/util/plugin.py
+++ b/ipsilon/util/plugin.py
@@ -25,7 +25,7 @@ class Plugins(object):
             #    mod = imp.load_compiled(name, file_name)
             else:
                 return
-        except Exception, e:  # pylint: disable=broad-except
+        except Exception as e:  # pylint: disable=broad-except
             cherrypy.log.error('Failed to load "%s" module: [%s]' % (name, e),
                                severity=logging.ERROR)
             return
@@ -41,7 +41,7 @@ class Plugins(object):
         files = None
         try:
             files = os.listdir(path)
-        except Exception, e:  # pylint: disable=broad-except
+        except Exception as e:  # pylint: disable=broad-except
             cherrypy.log.error('No modules in %s: [%s]' % (path, e),
                                severity=logging.ERROR)
             return
@@ -192,7 +192,7 @@ class PluginObject(Log):
         if config:
             try:
                 self.import_config(config)
-            except Exception, e:  # pylint: disable=broad-except
+            except Exception as e:  # pylint: disable=broad-except
                 self.error('Failed to refresh config for %s (%s)' %
                            (self.name, e))
         self.on_reconfigure()
diff --git a/tests/attrs.py b/tests/attrs.py
index a9fbcc8..736997f 100755
--- a/tests/attrs.py
+++ b/tests/attrs.py
@@ -120,7 +120,7 @@ if __name__ == '__main__':
     print "attrs: Authenticate to IDP ...",
     try:
         sess.auth_to_idp(idpname)
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -128,7 +128,7 @@ if __name__ == '__main__':
     print "attrs: Add SP Metadata to IDP ...",
     try:
         sess.add_sp_metadata(idpname, spname)
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -138,7 +138,7 @@ if __name__ == '__main__':
         page = sess.fetch_page(idpname,
                                'https://127.0.0.11:45081/sp/index.shtml')
         page.expected_value('text()', 'Test User %s' % user)
-    except ValueError, e:
+    except ValueError as e:
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
diff --git a/tests/authz.py b/tests/authz.py
index ab8a295..d635f3c 100755
--- a/tests/authz.py
+++ b/tests/authz.py
@@ -139,7 +139,7 @@ if __name__ == '__main__':
     print "authz: Authenticate to IDP ...",
     try:
         sess.auth_to_idp(idpname)
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -147,7 +147,7 @@ if __name__ == '__main__':
     print "authz: Add SP1 Metadata to IDP ...",
     try:
         sess.add_sp_metadata(idpname, sp1name)
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -155,7 +155,7 @@ if __name__ == '__main__':
     print "authz: Add SP2 Metadata to IDP ...",
     try:
         sess.add_sp_metadata(idpname, sp2name)
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -164,7 +164,7 @@ if __name__ == '__main__':
     try:
         page = sess.fetch_page(idpname, 'https://127.0.0.11:45081/sp/')
         page.expected_value('text()', 'WORKS!')
-    except ValueError, e:
+    except ValueError as e:
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -173,7 +173,7 @@ if __name__ == '__main__':
     try:
         sess.disable_plugin(idpname, 'authz', 'allow')
         sess.enable_plugin(idpname, 'authz', 'deny')
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -188,7 +188,7 @@ if __name__ == '__main__':
         sess2.auth_to_idp(idpname)
         page = sess2.fetch_page(idpname, 'https://127.0.0.11:45081/sp/')
         page.expected_status(401)
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -202,7 +202,7 @@ if __name__ == '__main__':
     try:
         page = sess3.fetch_page(idpname, 'https://127.0.0.11:45081/sp/')
         page.expected_status(401)
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -211,7 +211,7 @@ if __name__ == '__main__':
     try:
         sess.disable_plugin(idpname, 'authz', 'deny')
         sess.enable_plugin(idpname, 'authz', 'spgroup')
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -226,7 +226,7 @@ if __name__ == '__main__':
         sess4.auth_to_idp(idpname)
         page = sess4.fetch_page(idpname, 'https://127.0.0.11:45081/sp/')
         page.expected_value('text()', 'WORKS!')
-    except ValueError, e:
+    except ValueError as e:
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -235,7 +235,7 @@ if __name__ == '__main__':
     try:
         page = sess4.fetch_page(idpname, 'https://127.0.0.12:45082/sp/')
         page.expected_status(401)
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
diff --git a/tests/dbupgrades.py b/tests/dbupgrades.py
index 0d06a57..2fc36d6 100755
--- a/tests/dbupgrades.py
+++ b/tests/dbupgrades.py
@@ -149,7 +149,7 @@ if __name__ == '__main__':
     print "dbupgrades: From v%s: Authenticate to IDP ..." % from_version,
     try:
         sess.auth_to_idp(idpname)
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
diff --git a/tests/fconf.py b/tests/fconf.py
index 86c0809..2995c5c 100755
--- a/tests/fconf.py
+++ b/tests/fconf.py
@@ -178,7 +178,7 @@ if __name__ == '__main__':
     try:
         page = sess.fetch_page(idpname, 'https://127.0.0.10:45080/idp1/')
         page.expected_value('//title/text()', 'Ipsilon')
-    except ValueError, e:
+    except ValueError as e:
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -187,7 +187,7 @@ if __name__ == '__main__':
     try:
         page = sess.fetch_page(idpname, 'https://127.0.0.11:45081/sp/')
         page.expected_value('text()', 'WORKS!')
-    except ValueError, e:
+    except ValueError as e:
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
diff --git a/tests/ldap.py b/tests/ldap.py
index bc8b86a..bec4526 100755
--- a/tests/ldap.py
+++ b/tests/ldap.py
@@ -133,7 +133,7 @@ if __name__ == '__main__':
     print "ldap: Authenticate to IDP ...",
     try:
         sess.auth_to_idp(idpname)
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -141,7 +141,7 @@ if __name__ == '__main__':
     print "ldap: Add SP Metadata to IDP ...",
     try:
         sess.add_sp_metadata(idpname, spname)
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -151,7 +151,7 @@ if __name__ == '__main__':
         page = sess.fetch_page(idpname,
                                'https://127.0.0.11:45081/sp/index.shtml')
         page.expected_value('text()', 'Test Group;Test Group 2')
-    except ValueError, e:
+    except ValueError as e:
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
diff --git a/tests/ldapdown.py b/tests/ldapdown.py
index 6316a5e..f9d123d 100755
--- a/tests/ldapdown.py
+++ b/tests/ldapdown.py
@@ -138,7 +138,7 @@ if __name__ == '__main__':
             rule='//div[@class="alert alert-danger"]/p/text()',
             expected="Internal system error"
         )
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
diff --git a/tests/openid.py b/tests/openid.py
index 974e9ad..de0f9da 100755
--- a/tests/openid.py
+++ b/tests/openid.py
@@ -126,7 +126,7 @@ if __name__ == '__main__':
     print "openid: Revoking SP consent ...",
     try:
         page = sess.revoke_all_consent(idpname)
-    except ValueError, e:
+    except ValueError as e:
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -158,7 +158,7 @@ if __name__ == '__main__':
     try:
         sess.disable_plugin(idpname, 'authz', 'allow')
         sess.enable_plugin(idpname, 'authz', 'deny')
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
diff --git a/tests/openidc.py b/tests/openidc.py
index f6c6ab7..0bd8eee 100755
--- a/tests/openidc.py
+++ b/tests/openidc.py
@@ -218,7 +218,7 @@ if __name__ == '__main__':
     print "openidc: Authenticate to IDP ...",
     try:
         sess.auth_to_idp(idpname)
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -238,7 +238,7 @@ if __name__ == '__main__':
                           json=client_info)
         r.raise_for_status()
         reg_resp = r.json()
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -258,7 +258,7 @@ if __name__ == '__main__':
                           json=client_info)
         r.raise_for_status()
         reg_resp_none = r.json()
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -278,7 +278,7 @@ if __name__ == '__main__':
             'acr': '0'
         }
         old_token = check_info_results(page.text, expect)
-    except ValueError, e:
+    except ValueError as e:
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -290,7 +290,7 @@ if __name__ == '__main__':
                                'https://127.0.0.11:45081/sp/redirect_uri?log'
                                'out=https%3A%2F%2F127.0.0.11%3A45081%2Fsp%2F',
                                require_consent=False)
-    except ValueError, e:
+    except ValueError as e:
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -298,7 +298,7 @@ if __name__ == '__main__':
     print "openidc: Revoking SP consent ...",
     try:
         page = sess.revoke_all_consent(idpname)
-    except ValueError, e:
+    except ValueError as e:
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -320,7 +320,7 @@ if __name__ == '__main__':
             'acr': '0'
         }
         new_token = check_info_results(page.text, expect)
-    except ValueError, e:
+    except ValueError as e:
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -331,7 +331,7 @@ if __name__ == '__main__':
             idpname,
             'providers/openidc/admin/client/%s' % reg_resp['client_id'],
             {'Client Name': 'Test suite client updated'})
-    except ValueError, e:
+    except ValueError as e:
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -413,7 +413,7 @@ if __name__ == '__main__':
                                 'client_secret': reg_resp['client_secret']})
         if r.status_code != 400:
             raise Exception('Deleted client accepted')
-    except ValueError, e:
+    except ValueError as e:
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -475,7 +475,7 @@ if __name__ == '__main__':
                   'client_secret': reg_resp_none['client_secret']})
         if r.status_code != 200:
             raise Exception('Authed client not accepted')
-    except ValueError, e:
+    except ValueError as e:
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -500,7 +500,7 @@ if __name__ == '__main__':
         h.update('testcase')
         if info['sub'] != h.hexdigest():
             raise Exception('Sub claim invalid')
-    except ValueError, e:
+    except ValueError as e:
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -515,7 +515,7 @@ if __name__ == '__main__':
             'acr': '0'
         }
         check_info_results(page.text, expect)
-    except ValueError, e:
+    except ValueError as e:
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -534,7 +534,7 @@ if __name__ == '__main__':
             'acr': '0'
         }
         check_info_results(page.text, expect)
-    except ValueError, e:
+    except ValueError as e:
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -543,7 +543,7 @@ if __name__ == '__main__':
     try:
         sess.disable_plugin(idpname, 'authz', 'allow')
         sess.enable_plugin(idpname, 'authz', 'deny')
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -559,7 +559,7 @@ if __name__ == '__main__':
         page = sess2.fetch_page(idpname, 'https://127.0.0.11:45081/sp/')
         check_text_results(page.text,
                            'OpenID Connect Provider error: access_denied')
-    except ValueError, e:
+    except ValueError as e:
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -574,7 +574,7 @@ if __name__ == '__main__':
         page = sess3.fetch_page(idpname, 'https://127.0.0.11:45081/sp/')
         check_text_results(page.text,
                            'OpenID Connect Provider error: access_denied')
-    except ValueError, e:
+    except ValueError as e:
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
diff --git a/tests/pgdb.py b/tests/pgdb.py
index 2b10366..ecc548f 100755
--- a/tests/pgdb.py
+++ b/tests/pgdb.py
@@ -144,7 +144,7 @@ if __name__ == '__main__':
             sess.auth_to_idp(idpname)
             sess.logout_from_idp(idpname)
         sess.auth_to_idp(idpname)
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -152,7 +152,7 @@ if __name__ == '__main__':
     print "pgdb: Add SP Metadata to IDP ...",
     try:
         sess.add_sp_metadata(idpname, spname)
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -161,7 +161,7 @@ if __name__ == '__main__':
     try:
         page = sess.fetch_page(idpname, 'https://127.0.0.11:45081/sp/')
         page.expected_value('text()', 'WORKS!')
-    except ValueError, e:
+    except ValueError as e:
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -172,7 +172,7 @@ if __name__ == '__main__':
             'https://127.0.0.11:45081', 'saml2/logout',
             'ReturnTo=https://127.0.0.11:45081/open/logged_out.html'))
         page.expected_value('text()', 'Logged out')
-    except ValueError, e:
+    except ValueError as e:
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
diff --git a/tests/test1.py b/tests/test1.py
index f56135d..7049fe1 100755
--- a/tests/test1.py
+++ b/tests/test1.py
@@ -154,7 +154,7 @@ if __name__ == '__main__':
     print "test1: Authenticate to IDP ...",
     try:
         sess.auth_to_idp(idpname)
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -162,7 +162,7 @@ if __name__ == '__main__':
     print "test1: Add first SP Metadata to IDP ...",
     try:
         sess.add_sp_metadata(idpname, sp1name)
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -171,7 +171,7 @@ if __name__ == '__main__':
     try:
         page = sess.fetch_page(idpname, 'https://127.0.0.11:45081/sp/')
         page.expected_value('text()', 'WORKS!')
-    except ValueError, e:
+    except ValueError as e:
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -180,7 +180,7 @@ if __name__ == '__main__':
     try:
         page = sess.fetch_page(idpname, 'https://127.0.0.11:45082/sp/')
         page.expected_value('text()', 'WORKS!')
-    except ValueError, e:
+    except ValueError as e:
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -192,7 +192,7 @@ if __name__ == '__main__':
         sess.set_attributes_and_mapping(idpname, [],
                                         ['namefull', 'givenname', 'surname'],
                                         spname=sp2name)
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     else:
@@ -205,7 +205,7 @@ if __name__ == '__main__':
         newsess.auth_to_idp(idpname)
         print >> sys.stderr, " ERROR: Authentication should have failed"
         sys.exit(1)
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print " SUCCESS"
 
     print "test1: Add keyless SP Metadata to IDP ...",
@@ -216,7 +216,7 @@ if __name__ == '__main__':
         page.expected_value('//div[@id="row_provider_http://keyless-sp"]/'
                             '@title',
                             'WARNING: SP does not have signing keys!')
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
diff --git a/tests/testcleanup.py b/tests/testcleanup.py
index 5549e2b..e6a87c2 100755
--- a/tests/testcleanup.py
+++ b/tests/testcleanup.py
@@ -115,7 +115,7 @@ if __name__ == '__main__':
     try:
         page = sess.fetch_page(idpname, 'https://127.0.0.10:45080/idp1/')
         page.expected_value('//div[@id="content"]/p/a/text()', 'Log In')
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -123,7 +123,7 @@ if __name__ == '__main__':
     print "testcleanup: Authenticate to IDP ...",
     try:
         sess.auth_to_idp(idpname)
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -131,7 +131,7 @@ if __name__ == '__main__':
     print "testcleanup: Add SP Metadata to IDP ...",
     try:
         sess.add_sp_metadata(idpname, sp1name)
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -140,7 +140,7 @@ if __name__ == '__main__':
     try:
         page = sess.fetch_page(idpname, 'https://127.0.0.11:45081/sp/')
         page.expected_value('text()', 'WORKS!')
-    except ValueError, e:
+    except ValueError as e:
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -149,7 +149,7 @@ if __name__ == '__main__':
     try:
         page = sess.fetch_page(idpname, 'https://127.0.0.10:45080/idp1/')
         page.expected_value('//div[@id="content"]/p/a/text()', None)
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -164,7 +164,7 @@ if __name__ == '__main__':
         if len(cur.fetchall()) == 0:
             raise ValueError('SAML2 sessions not created')
         conn.close()
-    except ValueError, e:
+    except ValueError as e:
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -179,7 +179,7 @@ if __name__ == '__main__':
     try:
         page = sess.fetch_page(idpname, 'https://127.0.0.10:45080/idp1/')
         page.expected_value('//div[@id="content"]/p/a/text()', 'Log In')
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -193,7 +193,7 @@ if __name__ == '__main__':
         cur.execute('SELECT * FROM saml2_sessions;')
         if len(cur.fetchall()) != 0:
             raise ValueError('SAML2 sessions left behind: %s' % cur.fetchall())
-    except ValueError, e:
+    except ValueError as e:
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
diff --git a/tests/testetcd.py b/tests/testetcd.py
index b90594c..865f1a0 100755
--- a/tests/testetcd.py
+++ b/tests/testetcd.py
@@ -193,7 +193,7 @@ if __name__ == '__main__':
     print "etcd: Authenticate to IDP ...",
     try:
         sess.auth_to_idp(idpname)
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -201,7 +201,7 @@ if __name__ == '__main__':
     print "etcd: Add first SP Metadata to IDP ...",
     try:
         sess.add_sp_metadata(idpname, sp1name)
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -210,7 +210,7 @@ if __name__ == '__main__':
     try:
         page = sess.fetch_page(idpname, 'https://127.0.0.11:45081/sp/')
         page.expected_value('text()', 'WORKS!')
-    except ValueError, e:
+    except ValueError as e:
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -219,7 +219,7 @@ if __name__ == '__main__':
     try:
         page = sess.fetch_page(idpname, 'https://127.0.0.11:45082/sp/')
         page.expected_value('text()', 'WORKS!')
-    except ValueError, e:
+    except ValueError as e:
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -231,7 +231,7 @@ if __name__ == '__main__':
         sess.set_attributes_and_mapping(idpname, [],
                                         ['namefull', 'givenname', 'surname'],
                                         spname=sp2name)
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     else:
@@ -244,7 +244,7 @@ if __name__ == '__main__':
         newsess.auth_to_idp(idpname)
         print >> sys.stderr, " ERROR: Authentication should have failed"
         sys.exit(1)
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print " SUCCESS"
 
     print "etcd: Add keyless SP Metadata to IDP ...",
@@ -255,7 +255,7 @@ if __name__ == '__main__':
         page.expected_value('//div[@id="row_provider_http://keyless-sp"]/'
                             '@title',
                             'WARNING: SP does not have signing keys!')
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
diff --git a/tests/testgssapi.py b/tests/testgssapi.py
index db89c3d..929dfd9 100755
--- a/tests/testgssapi.py
+++ b/tests/testgssapi.py
@@ -166,7 +166,7 @@ if __name__ == '__main__':
     print "testgssapi: Authenticate to IDP ...",
     try:
         sess.auth_to_idp(idpname, krb=True)
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -174,7 +174,7 @@ if __name__ == '__main__':
     print "testgssapi: Add first SP Metadata to IDP ...",
     try:
         sess.add_sp_metadata(idpname, sp1name)
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -183,7 +183,7 @@ if __name__ == '__main__':
     try:
         page = sess.fetch_page(idpname, 'https://127.0.0.11:45081/sp/')
         page.expected_value('text()', 'WORKS!')
-    except ValueError, e:
+    except ValueError as e:
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -192,7 +192,7 @@ if __name__ == '__main__':
     try:
         page = sess.fetch_page(idpname, 'https://127.0.0.11:45082/sp/')
         page.expected_value('text()', 'WORKS!')
-    except ValueError, e:
+    except ValueError as e:
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
diff --git a/tests/testlogout.py b/tests/testlogout.py
index a687e3e..ae5d156 100755
--- a/tests/testlogout.py
+++ b/tests/testlogout.py
@@ -190,7 +190,7 @@ if __name__ == '__main__':
     print "testlogout: Authenticate to IDP ...",
     try:
         sess.auth_to_idp(idpname)
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -200,7 +200,7 @@ if __name__ == '__main__':
         print "testlogout: Add SP Metadata for %s to IDP ..." % spname,
         try:
             sess.add_sp_metadata(idpname, spname)
-        except Exception, e:  # pylint: disable=broad-except
+        except Exception as e:  # pylint: disable=broad-except
             print >> sys.stderr, " ERROR: %s" % repr(e)
             sys.exit(1)
         print " SUCCESS"
@@ -211,7 +211,7 @@ if __name__ == '__main__':
             'https://127.0.0.11:45081', 'saml2/logout',
             'ReturnTo=https://127.0.0.11:45081/open/logged_out.html'))
         page.expected_value('text()', 'Logged out')
-    except ValueError, e:
+    except ValueError as e:
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -220,7 +220,7 @@ if __name__ == '__main__':
     try:
         page = sess.fetch_page(idpname, 'https://127.0.0.11:45081/sp/')
         page.expected_value('text()', 'WORKS!')
-    except ValueError, e:
+    except ValueError as e:
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -231,7 +231,7 @@ if __name__ == '__main__':
             'https://127.0.0.11:45081', 'saml2/logout',
             'ReturnTo=https://127.0.0.11:45081/open/logged_out.html'))
         page.expected_value('text()', 'Logged out')
-    except ValueError, e:
+    except ValueError as e:
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -242,7 +242,7 @@ if __name__ == '__main__':
             'https://127.0.0.11:45081', 'saml2/logout',
             'ReturnTo=https://127.0.0.11:45081/open/logged_out.html'))
         page.expected_value('text()', 'Logged out')
-    except ValueError, e:
+    except ValueError as e:
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -250,7 +250,7 @@ if __name__ == '__main__':
     print "testlogout: Ensure logout ...",
     try:
         ensure_logout(sess, idpname, 'https://127.0.0.11:45081/sp/')
-    except ValueError, e:
+    except ValueError as e:
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -265,7 +265,7 @@ if __name__ == '__main__':
             try:
                 page = sess.fetch_page(idpname, spurl)
                 page.expected_value('text()', 'WORKS!')
-            except ValueError, e:
+            except ValueError as e:
                 print >> sys.stderr, " ERROR: %s" % repr(e)
                 sys.exit(1)
         print " SUCCESS"
@@ -277,7 +277,7 @@ if __name__ == '__main__':
                 logouturl, 'saml2/logout',
                 'ReturnTo=https://127.0.0.11:45081/open/logged_out.html'))
             page.expected_value('text()', 'Logged out')
-        except ValueError, e:
+        except ValueError as e:
             print >> sys.stderr, " ERROR: %s" % repr(e)
             sys.exit(1)
         print " SUCCESS"
@@ -288,7 +288,7 @@ if __name__ == '__main__':
             spurl = 'https://%s:%s/sp/' % (sp['addr'], sp['port'])
             try:
                 ensure_logout(sess, idpname, spurl)
-            except ValueError, e:
+            except ValueError as e:
                 print >> sys.stderr, " ERROR: %s" % repr(e)
                 sys.exit(1)
         print " SUCCESS"
@@ -298,7 +298,7 @@ if __name__ == '__main__':
     try:
         page = sess.fetch_page(idpname, 'https://127.0.0.11:45081/sp/')
         page.expected_value('text()', 'WORKS!')
-    except ValueError, e:
+    except ValueError as e:
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -307,7 +307,7 @@ if __name__ == '__main__':
     try:
         page = sess.fetch_page(idpname, 'https://127.0.0.11:45082/sp/')
         page.expected_value('text()', 'WORKS!')
-    except ValueError, e:
+    except ValueError as e:
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -318,7 +318,7 @@ if __name__ == '__main__':
                                'https://127.0.0.10:45080/%s' % idpname)
         page.expected_value('//div[@id="welcome"]/p/text()',
                             'Welcome %s!' % user)
-    except ValueError, e:
+    except ValueError as e:
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -328,7 +328,7 @@ if __name__ == '__main__':
         page = sess.fetch_page(idpname,
                                'https://127.0.0.10:45080/%s/logout' % idpname)
         page.expected_value('//div[@id="content"]/p/a/text()', 'Log In')
-    except ValueError, e:
+    except ValueError as e:
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -336,7 +336,7 @@ if __name__ == '__main__':
     print "testlogout: Ensure logout of SP1 ...",
     try:
         ensure_logout(sess, idpname, 'https://127.0.0.11:45081/sp/')
-    except ValueError, e:
+    except ValueError as e:
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -344,7 +344,7 @@ if __name__ == '__main__':
     print "testlogout: Ensure logout of SP2 ...",
     try:
         ensure_logout(sess, idpname, 'https://127.0.0.11:45082/sp/')
-    except ValueError, e:
+    except ValueError as e:
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -355,7 +355,7 @@ if __name__ == '__main__':
                                'https://127.0.0.10:45080/%s/login' % idpname)
         page.expected_value('//div[@id="welcome"]/p/text()',
                             'Welcome %s!' % user)
-    except ValueError, e:
+    except ValueError as e:
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -366,7 +366,7 @@ if __name__ == '__main__':
                                'https://127.0.0.10:45080/%s/logout' % idpname)
         page.expected_value('//div[@id="logout"]/p//text()',
                             'Successfully logged out.')
-    except ValueError, e:
+    except ValueError as e:
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
diff --git a/tests/testmapping.py b/tests/testmapping.py
index edfbb61..c3650a4 100755
--- a/tests/testmapping.py
+++ b/tests/testmapping.py
@@ -183,7 +183,7 @@ if __name__ == '__main__':
     print "testmapping: Authenticate to IDP ...",
     try:
         sess.auth_to_idp(idpname)
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -191,7 +191,7 @@ if __name__ == '__main__':
     print "testmapping: Add SP Metadata to IDP ...",
     try:
         sess.add_sp_metadata(idpname, sp['name'])
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -207,7 +207,7 @@ if __name__ == '__main__':
             'groups': user,
         }
         check_info_plugin(sess, idpname, spurl, expect)
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -218,7 +218,7 @@ if __name__ == '__main__':
             idpname,
             [['*', '*'],
              ['fullname', 'namefull']])
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     else:
@@ -235,7 +235,7 @@ if __name__ == '__main__':
             'groups': user
         }
         check_info_plugin(sess, idpname, spurl, expect)
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     else:
@@ -247,7 +247,7 @@ if __name__ == '__main__':
             idpname,
             [],
             ['namefull', 'givenname', 'surname'])
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     else:
@@ -261,7 +261,7 @@ if __name__ == '__main__':
             'givenname': u'Test User 一',
         }
         check_info_plugin(sess, idpname, spurl, expect)
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     else:
@@ -273,7 +273,7 @@ if __name__ == '__main__':
             idpname, [['*', '*']],
             ['wholename', 'givenname', 'surname',
              'email', 'fullname'], sp['name'])
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     else:
@@ -288,7 +288,7 @@ if __name__ == '__main__':
             'email': '%s@example.com' % user,
         }
         check_info_plugin(sess, idpname, spurl, expect)
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     else:
@@ -304,7 +304,7 @@ if __name__ == '__main__':
              'surname',
              'email', 'fullname'],
             sp['name'])
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     else:
@@ -320,7 +320,7 @@ if __name__ == '__main__':
             'email': '%s@example.com' % user,
         }
         check_info_plugin(sess, idpname, spurl, expect)
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     else:
@@ -340,7 +340,7 @@ if __name__ == '__main__':
              'email',
              'fullname'],
             sp['name'])
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     else:
@@ -357,7 +357,7 @@ if __name__ == '__main__':
             'email': '%s@example.com' % user,
         }
         check_info_plugin(sess, idpname, spurl, expect)
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     else:
@@ -371,7 +371,7 @@ if __name__ == '__main__':
              ['email', 'email']],
             ['wholename', 'email'],
             sp['name'])
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     else:
@@ -385,7 +385,7 @@ if __name__ == '__main__':
             'NAME_ID': user,
         }
         check_info_plugin(sess, idpname, spurl, expect)
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     else:
@@ -402,7 +402,7 @@ if __name__ == '__main__':
              'surname',
              'email', 'fullname'],
             sp['name'])
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     else:
@@ -419,7 +419,7 @@ if __name__ == '__main__':
             'NAME_ID': '%s@example.com' % user,
         }
         check_info_plugin(sess, idpname, spurl, expect)
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     else:
@@ -431,7 +431,7 @@ if __name__ == '__main__':
             idpname, [],
             ['givenname', 'surname', 'email',
              'fullname'], sp['name'])
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     else:
@@ -446,7 +446,7 @@ if __name__ == '__main__':
             'email': '%s@example.com' % user,
         }
         check_info_plugin(sess, idpname, spurl, expect)
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     else:
@@ -455,7 +455,7 @@ if __name__ == '__main__':
     print "testmapping: Drop SP allowed attributes ...",
     try:
         sess.set_attributes_and_mapping(idpname, [], [], sp['name'])
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     else:
@@ -469,7 +469,7 @@ if __name__ == '__main__':
             'givenname': u'Test User 一',
         }
         check_info_plugin(sess, idpname, spurl, expect)
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     else:
diff --git a/tests/testnameid.py b/tests/testnameid.py
index 792a1e5..7ac5eb3 100755
--- a/tests/testnameid.py
+++ b/tests/testnameid.py
@@ -211,7 +211,7 @@ if __name__ == '__main__':
         print "testnameid: Authenticate to IDP ...",
         try:
             sess.auth_to_idp(idpname, krb=krb)
-        except Exception, e:  # pylint: disable=broad-except
+        except Exception as e:  # pylint: disable=broad-except
             print >> sys.stderr, " ERROR: %s" % repr(e)
             sys.exit(1)
         print " SUCCESS"
@@ -219,7 +219,7 @@ if __name__ == '__main__':
         print "testnameid: Add SP Metadata to IDP ...",
         try:
             sess.add_sp_metadata(idpname, spname)
-        except Exception, e:  # pylint: disable=broad-except
+        except Exception as e:  # pylint: disable=broad-except
             print >> sys.stderr, " ERROR: %s" % repr(e)
             sys.exit(1)
         print " SUCCESS"
@@ -227,7 +227,7 @@ if __name__ == '__main__':
         print "testnameid: Set supported Name ID formats ...",
         try:
             sess.set_sp_default_nameids(idpname, spname, [spname])
-        except Exception, e:  # pylint: disable=broad-except
+        except Exception as e:  # pylint: disable=broad-except
             print >> sys.stderr, " ERROR: %s" % repr(e)
             sys.exit(1)
         print " SUCCESS"
@@ -240,7 +240,7 @@ if __name__ == '__main__':
                     'page did not contain expression %s' %
                     expected_re[spname]
                 )
-        except ValueError, e:
+        except ValueError as e:
             if expected[spname]:
                 print >> sys.stderr, " ERROR: %s" % repr(e)
                 sys.exit(1)
@@ -256,7 +256,7 @@ if __name__ == '__main__':
             newsess.auth_to_idp(idpname)
             print >> sys.stderr, " ERROR: Authentication should have failed"
             sys.exit(1)
-        except Exception, e:  # pylint: disable=broad-except
+        except Exception as e:  # pylint: disable=broad-except
             print " SUCCESS"
 
     # Ensure that transient names change with each authentication
@@ -276,7 +276,7 @@ if __name__ == '__main__':
         print "testnameid: Authenticate to IDP ...",
         try:
             sess.auth_to_idp(idpname)
-        except Exception, e:  # pylint: disable=broad-except
+        except Exception as e:  # pylint: disable=broad-except
             print >> sys.stderr, " ERROR: %s" % repr(e)
             sys.exit(1)
         else:
@@ -286,7 +286,7 @@ if __name__ == '__main__':
         try:
             page = sess.fetch_page(idpname, '%s/sp/' % spurl)
             t1 = page.text
-        except ValueError, e:
+        except ValueError as e:
             print >> sys.stderr, " ERROR: %s" % repr(e)
             sys.exit(1)
         else:
@@ -296,7 +296,7 @@ if __name__ == '__main__':
         try:
             page = sess.fetch_page(idpname, '%s/sp/' % spurl)
             t2 = page.text
-        except ValueError, e:
+        except ValueError as e:
             print >> sys.stderr, " ERROR: %s" % repr(e)
             sys.exit(1)
         else:
@@ -334,7 +334,7 @@ if __name__ == '__main__':
         print "testnameid: Authenticate to IDP ...",
         try:
             sess.auth_to_idp(idpname)
-        except Exception, e:  # pylint: disable=broad-except
+        except Exception as e:  # pylint: disable=broad-except
             print >> sys.stderr, " ERROR: %s" % repr(e)
             sys.exit(1)
         else:
@@ -344,7 +344,7 @@ if __name__ == '__main__':
         try:
             page = sess.fetch_page(idpname, '%s/sp/' % spurl)
             t1 = page.text
-        except ValueError, e:
+        except ValueError as e:
             print >> sys.stderr, " ERROR: %s" % repr(e)
             sys.exit(1)
         else:
@@ -354,7 +354,7 @@ if __name__ == '__main__':
         try:
             page = sess.fetch_page(idpname, '%s/sp/' % spurl)
             t2 = page.text
-        except ValueError, e:
+        except ValueError as e:
             print >> sys.stderr, " ERROR: %s" % repr(e)
             sys.exit(1)
         else:
diff --git a/tests/testrest.py b/tests/testrest.py
index 02824ed..a97ec38 100755
--- a/tests/testrest.py
+++ b/tests/testrest.py
@@ -160,7 +160,7 @@ if __name__ == '__main__':
     print "testrest: Authenticate to IDP ...",
     try:
         sess.auth_to_idp(idpname)
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -172,7 +172,7 @@ if __name__ == '__main__':
             raise ValueError(
                 'Expected no SP and got %d' % len(result['result'])
             )
-    except ValueError, e:
+    except ValueError as e:
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -180,7 +180,7 @@ if __name__ == '__main__':
     print "testrest: Add SP Metadata to IDP via admin ...",
     try:
         sess.add_sp_metadata(idpname, spname)
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -197,7 +197,7 @@ if __name__ == '__main__':
                 'Expected %s and got %s' %
                 (spname, result['result'][0].get('provider'))
             )
-    except ValueError, e:
+    except ValueError as e:
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -205,7 +205,7 @@ if __name__ == '__main__':
     print "testrest: Add Service Provider via REST ...",
     try:
         sess.add_sp_metadata(idpname, sp2name, rest=True)
-    except ValueError, e:
+    except ValueError as e:
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -217,7 +217,7 @@ if __name__ == '__main__':
             raise ValueError(
                 'Expected 2 SPs and got %d' % len(result['result'])
             )
-    except ValueError, e:
+    except ValueError as e:
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -246,7 +246,7 @@ if __name__ == '__main__':
                 'Expected %s and got %s' %
                 (spname, result['result'][0].get('provider'))
             )
-    except ValueError, e:
+    except ValueError as e:
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -256,7 +256,7 @@ if __name__ == '__main__':
     print "testrest: Add illegally named Service Provider via REST ...",
     try:
         sess.add_sp_metadata(idpname, sp3name, rest=True)
-    except ValueError, e:
+    except ValueError as e:
         print " SUCCESS"
     else:
         print >> sys.stderr, "ERROR: " \
@@ -269,7 +269,7 @@ if __name__ == '__main__':
             idpname,
             '/%s/rest/providers/saml2/notfound' % idpname
         )
-    except ValueError, e:
+    except ValueError as e:
         if '(501)' not in e.message:
             print >> sys.stderr, " ERROR: %s" % repr(e)
             sys.exit(1)
@@ -282,7 +282,7 @@ if __name__ == '__main__':
     print "testrest: Fetch non-existent SP via REST ...",
     try:
         result = sess.get_rest_sp(idpname, 'foo')
-    except ValueError, e:
+    except ValueError as e:
         if '(404)' not in e.message:
             print >> sys.stderr, " ERROR: %s" % repr(e)
             sys.exit(1)
@@ -295,7 +295,7 @@ if __name__ == '__main__':
     print "testrest: Re-add Service Provider via REST ...",
     try:
         sess.add_sp_metadata(idpname, sp2name, rest=True)
-    except ValueError, e:
+    except ValueError as e:
         print " SUCCESS"
     else:
         print >> sys.stderr, "ERROR: " \
diff --git a/tests/testroot.py b/tests/testroot.py
index 353de5a..605b0e5 100755
--- a/tests/testroot.py
+++ b/tests/testroot.py
@@ -154,7 +154,7 @@ if __name__ == '__main__':
     print "testroot: Authenticate to IDP ...",
     try:
         sess.auth_to_idp(idpname)
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -162,7 +162,7 @@ if __name__ == '__main__':
     print "testroot: Add first SP Metadata to IDP ...",
     try:
         sess.add_sp_metadata(idpname, sp1name)
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -171,7 +171,7 @@ if __name__ == '__main__':
     try:
         page = sess.fetch_page(idpname, 'https://127.0.0.11:45081/sp/')
         page.expected_value('text()', 'WORKS!')
-    except ValueError, e:
+    except ValueError as e:
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -180,7 +180,7 @@ if __name__ == '__main__':
     try:
         page = sess.fetch_page(idpname, 'https://127.0.0.11:45082/sp/')
         page.expected_value('text()', 'WORKS!')
-    except ValueError, e:
+    except ValueError as e:
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -192,5 +192,5 @@ if __name__ == '__main__':
         newsess.auth_to_idp(idpname)
         print >> sys.stderr, " ERROR: Authentication should have failed"
         sys.exit(1)
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print " SUCCESS"
diff --git a/tests/tests.py b/tests/tests.py
index af43112..189f157 100755
--- a/tests/tests.py
+++ b/tests/tests.py
@@ -106,7 +106,7 @@ if __name__ == '__main__':
         code = test.run(env)
         if code:
             sys.exit(code)
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, "Error: %s" % repr(e)
         traceback.print_exc(None, sys.stderr)
         sys.exit(1)
diff --git a/tests/trans.py b/tests/trans.py
index 8d83da1..e8f0be2 100755
--- a/tests/trans.py
+++ b/tests/trans.py
@@ -111,7 +111,7 @@ if __name__ == '__main__':
         sess.add_server(spname, 'https://127.0.0.11:45081')
         sess.auth_to_idp(idpname)
         sess.add_sp_metadata(idpname, spname)
-    except Exception, e:  # pylint: disable=broad-except
+    except Exception as e:  # pylint: disable=broad-except
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"
@@ -123,7 +123,7 @@ if __name__ == '__main__':
         sess.add_server(spname, 'https://127.0.0.11:45081')
         page = sess.fetch_page(idpname, 'https://127.0.0.11:45081/sp/')
         page.expected_value('text()', 'WORKS!')
-    except ValueError, e:
+    except ValueError as e:
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)
     print " SUCCESS"