diff options
| author | Petr Viktorin <pviktori@redhat.com> | 2015-07-30 16:49:29 +0200 |
|---|---|---|
| committer | Tomas Babej <tbabej@redhat.com> | 2015-08-12 18:17:23 +0200 |
| commit | 27dabb45282911e375336f75934af9dd6cc5d963 (patch) | |
| tree | 3c8fe5255d60613fa9cd14d053b3688feed740c9 /ipatests/test_cmdline | |
| parent | a651be3eec2a08bd2865b16b0eed767db69aab0f (diff) | |
| download | freeipa-27dabb45282911e375336f75934af9dd6cc5d963.tar.gz freeipa-27dabb45282911e375336f75934af9dd6cc5d963.tar.xz freeipa-27dabb45282911e375336f75934af9dd6cc5d963.zip | |
Modernize 'except' clauses
The 'as' syntax works from Python 2 on, and Python 3 will
drop the "comma" syntax.
Reviewed-By: Tomas Babej <tbabej@redhat.com>
Diffstat (limited to 'ipatests/test_cmdline')
| -rw-r--r-- | ipatests/test_cmdline/cmdline.py | 2 | ||||
| -rw-r--r-- | ipatests/test_cmdline/test_ipagetkeytab.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ipatests/test_cmdline/cmdline.py b/ipatests/test_cmdline/cmdline.py index a7ed67793..0ae8cc079 100644 --- a/ipatests/test_cmdline/cmdline.py +++ b/ipatests/test_cmdline/cmdline.py @@ -42,7 +42,7 @@ try: server_available = True except errors.DatabaseError: server_available = False -except Exception, e: +except Exception as e: server_available = False class cmdline_test(XMLRPC_test): diff --git a/ipatests/test_cmdline/test_ipagetkeytab.py b/ipatests/test_cmdline/test_ipagetkeytab.py index bc948bf09..2b99c268e 100644 --- a/ipatests/test_cmdline/test_ipagetkeytab.py +++ b/ipatests/test_cmdline/test_ipagetkeytab.py @@ -48,7 +48,7 @@ def use_keytab(principal, keytab): conn = ldap2(api) conn.connect(ccache=ccache) conn.disconnect() - except krbV.Krb5Error, e: + except krbV.Krb5Error as e: raise StandardError('Unable to bind to LDAP. Error initializing principal %s in %s: %s' % (principal.name, keytab, str(e))) finally: del os.environ['KRB5CCNAME'] @@ -111,7 +111,7 @@ class test_ipagetkeytab(cmdline_test): expected = 'Keytab successfully retrieved and stored in: %s\n' % ( self.keytabname) assert expected in err, 'Success message not in output:\n%s' % err - except ipautil.CalledProcessError, e: + except ipautil.CalledProcessError as e: assert (False) def test_3_use(self): @@ -141,7 +141,7 @@ class test_ipagetkeytab(cmdline_test): """ try: use_keytab(self.service_princ, self.keytabname) - except StandardError, errmsg: + except StandardError as errmsg: assert('Unable to bind to LDAP. Error initializing principal' in str(errmsg)) def test_9_cleanup(self): |