Mercurial > kallithea
changeset 5570:e856e728b916
cleanup: fix 'try ... except ...' formatting missed in d69aa464f373
Examples spotted by Jiří Suchan <yed@vanyli.net>.
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Sat, 07 Nov 2015 13:24:48 +0100 |
| parents | ebc4cc82cce2 |
| children | bedb8905c6f8 |
| files | kallithea/controllers/changeset.py kallithea/controllers/files.py kallithea/controllers/search.py kallithea/lib/auth_modules/auth_ldap.py kallithea/lib/dbmigrate/migrate/versioning/schema.py kallithea/lib/dbmigrate/versions/001_initial_release.py |
| diffstat | 6 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/controllers/changeset.py Sat Nov 07 13:24:44 2015 +0100 +++ b/kallithea/controllers/changeset.py Sat Nov 07 13:24:48 2015 +0100 @@ -206,7 +206,7 @@ if not c.cs_ranges: raise RepositoryError('Changeset range returned empty result') - except(ChangesetDoesNotExistError,), e: + except ChangesetDoesNotExistError: log.debug(traceback.format_exc()) msg = _('Such revision does not exist for this repository') h.flash(msg, category='error')
--- a/kallithea/controllers/files.py Sat Nov 07 13:24:44 2015 +0100 +++ b/kallithea/controllers/files.py Sat Nov 07 13:24:48 2015 +0100 @@ -92,7 +92,7 @@ h.flash(h.literal(_('There are no files yet. %s') % add_new), category='warning') raise HTTPNotFound() - except(ChangesetDoesNotExistError, LookupError), e: + except (ChangesetDoesNotExistError, LookupError): msg = _('Such revision does not exist for this repository') h.flash(msg, category='error') raise HTTPNotFound() @@ -112,7 +112,7 @@ file_node = cs.get_node(path) if file_node.is_dir(): raise RepositoryError('given path is a directory') - except(ChangesetDoesNotExistError,), e: + except ChangesetDoesNotExistError: msg = _('Such revision does not exist for this repository') h.flash(msg, category='error') raise HTTPNotFound()
--- a/kallithea/controllers/search.py Sat Nov 07 13:24:44 2015 +0100 +++ b/kallithea/controllers/search.py Sat Nov 07 13:24:48 2015 +0100 @@ -139,7 +139,7 @@ log.error('Empty Index data') c.runtime = _('There is no index to search in. ' 'Please run whoosh indexer') - except (Exception): + except Exception: log.error(traceback.format_exc()) c.runtime = _('An error occurred during search operation.')
--- a/kallithea/lib/auth_modules/auth_ldap.py Sat Nov 07 13:24:44 2015 +0100 +++ b/kallithea/lib/auth_modules/auth_ldap.py Sat Nov 07 13:24:48 2015 +0100 @@ -356,7 +356,7 @@ except (LdapUsernameError, LdapPasswordError, LdapImportError): log.error(traceback.format_exc()) return None - except (Exception,): + except Exception: log.error(traceback.format_exc()) return None
--- a/kallithea/lib/dbmigrate/migrate/versioning/schema.py Sat Nov 07 13:24:44 2015 +0100 +++ b/kallithea/lib/dbmigrate/migrate/versioning/schema.py Sat Nov 07 13:24:48 2015 +0100 @@ -67,7 +67,7 @@ else: try: self.table.drop() - except (sa_exceptions.SQLError): + except sa_exceptions.SQLError: raise exceptions.DatabaseNotControlledError(str(self.table)) def changeset(self, version=None):
--- a/kallithea/lib/dbmigrate/versions/001_initial_release.py Sat Nov 07 13:24:44 2015 +0100 +++ b/kallithea/lib/dbmigrate/versions/001_initial_release.py Sat Nov 07 13:24:48 2015 +0100 @@ -77,7 +77,7 @@ session.add(self) session.commit() log.debug('updated user %s lastlogin', self.username) - except (DatabaseError,): + except DatabaseError: session.rollback()