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 /install/migration | |
| 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 'install/migration')
| -rw-r--r-- | install/migration/migration.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/install/migration/migration.py b/install/migration/migration.py index 8c440175a..e1823e151 100644 --- a/install/migration/migration.py +++ b/install/migration/migration.py @@ -52,12 +52,12 @@ def bind(ldap_uri, base_dn, username, password): try: conn = IPAdmin(ldap_uri=ldap_uri) conn.do_simple_bind(bind_dn, password) - except (errors.ACIError, errors.DatabaseError, errors.NotFound), e: + except (errors.ACIError, errors.DatabaseError, errors.NotFound) as e: root_logger.error( 'migration invalid credentials for %s: %s' % (bind_dn, e)) raise IOError( errno.EPERM, 'Invalid LDAP credentials for user %s' % username) - except Exception, e: + except Exception as e: root_logger.error('migration bind failed: %s' % e) raise IOError(errno.EIO, 'Bind error') finally: |