# HG changeset patch # User Mads Kiilerich # Date 2015-11-07 13:24:48 # Node ID e856e728b916b540b10f09d0b5157deeb457a0d6 # Parent ebc4cc82cce2685755e3404745d24819029fc8ab cleanup: fix 'try ... except ...' formatting missed in d69aa464f373 Examples spotted by Jiří Suchan . diff --git a/kallithea/controllers/changeset.py b/kallithea/controllers/changeset.py --- a/kallithea/controllers/changeset.py +++ b/kallithea/controllers/changeset.py @@ -206,7 +206,7 @@ class ChangesetController(BaseRepoContro 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') diff --git a/kallithea/controllers/files.py b/kallithea/controllers/files.py --- a/kallithea/controllers/files.py +++ b/kallithea/controllers/files.py @@ -92,7 +92,7 @@ class FilesController(BaseRepoController 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 @@ class FilesController(BaseRepoController 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() diff --git a/kallithea/controllers/search.py b/kallithea/controllers/search.py --- a/kallithea/controllers/search.py +++ b/kallithea/controllers/search.py @@ -139,7 +139,7 @@ class SearchController(BaseRepoControlle 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.') diff --git a/kallithea/lib/auth_modules/auth_ldap.py b/kallithea/lib/auth_modules/auth_ldap.py --- a/kallithea/lib/auth_modules/auth_ldap.py +++ b/kallithea/lib/auth_modules/auth_ldap.py @@ -356,7 +356,7 @@ class KallitheaAuthPlugin(auth_modules.K except (LdapUsernameError, LdapPasswordError, LdapImportError): log.error(traceback.format_exc()) return None - except (Exception,): + except Exception: log.error(traceback.format_exc()) return None diff --git a/kallithea/lib/dbmigrate/migrate/versioning/schema.py b/kallithea/lib/dbmigrate/migrate/versioning/schema.py --- a/kallithea/lib/dbmigrate/migrate/versioning/schema.py +++ b/kallithea/lib/dbmigrate/migrate/versioning/schema.py @@ -67,7 +67,7 @@ class ControlledSchema(object): else: try: self.table.drop() - except (sa_exceptions.SQLError): + except sa_exceptions.SQLError: raise exceptions.DatabaseNotControlledError(str(self.table)) def changeset(self, version=None): diff --git a/kallithea/lib/dbmigrate/versions/001_initial_release.py b/kallithea/lib/dbmigrate/versions/001_initial_release.py --- a/kallithea/lib/dbmigrate/versions/001_initial_release.py +++ b/kallithea/lib/dbmigrate/versions/001_initial_release.py @@ -77,7 +77,7 @@ class User(Base): session.add(self) session.commit() log.debug('updated user %s lastlogin', self.username) - except (DatabaseError,): + except DatabaseError: session.rollback()