From fa97f70338e9ef5dad0404b4f9b4a24590c1e4bc Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Dec 02 2015 08:30:54 +0000 Subject: Make the code handling exception be python3 compatible --- diff --git a/ev-server/pagure-stream-server.py b/ev-server/pagure-stream-server.py index e6911f9..4ff7304 100644 --- a/ev-server/pagure-stream-server.py +++ b/ev-server/pagure-stream-server.py @@ -180,7 +180,7 @@ def stats(client_reader, client_writer): client_writer.write(('data: %s\n\n' % SERVER.active_count).encode()) yield trollius.From(client_writer.drain()) - except trollius.ConnectionResetError, err: + except trollius.ConnectionResetError as err: log.info(err) pass finally: diff --git a/files/load_from_disk.py b/files/load_from_disk.py index 5f0feb6..4f8d124 100644 --- a/files/load_from_disk.py +++ b/files/load_from_disk.py @@ -60,7 +60,7 @@ def main(folder, debug=False): keydir=pagure.APP.config.get('GITOLITE_KEYDIR', None), ) pagure.SESSION.commit() - except SQLAlchemyError, err: + except SQLAlchemyError as err: pagure.SESSION.rollback() print 'ERROR with user %s' % user print err @@ -92,10 +92,10 @@ def main(folder, debug=False): requestfolder=pagure.APP.config['REQUESTS_FOLDER'], ) pagure.SESSION.commit() - except pagure.exceptions.PagureException, err: + except pagure.exceptions.PagureException as err: print 'ERROR with project %s' % project print err - except SQLAlchemyError, err: # pragma: no cover + except SQLAlchemyError as err: # pragma: no cover pagure.SESSION.rollback() print 'ERROR (DB) with project %s' % project print err diff --git a/pagure/__init__.py b/pagure/__init__.py index a9b4385..a588dda 100644 --- a/pagure/__init__.py +++ b/pagure/__init__.py @@ -233,7 +233,7 @@ def set_user(return_url): keydir=APP.config.get('GITOLITE_KEYDIR', None), ) SESSION.commit() - except SQLAlchemyError, err: + except SQLAlchemyError as err: SESSION.rollback() LOG.debug(err) LOG.exception(err) diff --git a/pagure/api/fork.py b/pagure/api/fork.py index 3040b53..0bd5154 100644 --- a/pagure/api/fork.py +++ b/pagure/api/fork.py @@ -487,7 +487,7 @@ def api_pull_request_add_comment(repo, requestid, username=None): except pagure.exceptions.PagureException as err: raise pagure.exceptions.APIError( 400, error_code=APIERROR.ENOCODE, error=str(err)) - except SQLAlchemyError, err: # pragma: no cover + except SQLAlchemyError as err: # pragma: no cover APP.logger.exception(err) SESSION.rollback() raise pagure.exceptions.APIError(400, error_code=APIERROR.EDBERROR) @@ -621,7 +621,7 @@ def api_pull_request_add_flag(repo, requestid, username=None): except pagure.exceptions.PagureException as err: raise pagure.exceptions.APIError( 400, error_code=APIERROR.ENOCODE, error=str(err)) - except SQLAlchemyError, err: # pragma: no cover + except SQLAlchemyError as err: # pragma: no cover APP.logger.exception(err) SESSION.rollback() raise pagure.exceptions.APIError(400, error_code=APIERROR.EDBERROR) diff --git a/pagure/api/issue.py b/pagure/api/issue.py index f334b16..9dd67e7 100644 --- a/pagure/api/issue.py +++ b/pagure/api/issue.py @@ -123,7 +123,7 @@ def api_new_issue(repo, username=None): SESSION.commit() output['message'] = 'Issue created' - except SQLAlchemyError, err: # pragma: no cover + except SQLAlchemyError as err: # pragma: no cover SESSION.rollback() APP.logger.exception(err) raise pagure.exceptions.APIError(400, error_code=APIERROR.EDBERROR) @@ -536,10 +536,10 @@ def api_change_status_issue(repo, issueid, username=None): output['message'] = message else: output['message'] = 'No changes' - except pagure.exceptions.PagureException, err: + except pagure.exceptions.PagureException as err: raise pagure.exceptions.APIError( 400, error_code=APIERROR.ENOCODE, error=str(err)) - except SQLAlchemyError, err: # pragma: no cover + except SQLAlchemyError as err: # pragma: no cover SESSION.rollback() raise pagure.exceptions.APIError(400, error_code=APIERROR.EDBERROR) @@ -626,7 +626,7 @@ def api_comment_issue(repo, issueid, username=None): ) SESSION.commit() output['message'] = message - except SQLAlchemyError, err: # pragma: no cover + except SQLAlchemyError as err: # pragma: no cover SESSION.rollback() APP.logger.exception(err) raise pagure.exceptions.APIError(400, error_code=APIERROR.EDBERROR) diff --git a/pagure/hooks/files/git_multimail.py b/pagure/hooks/files/git_multimail.py index 53ab43a..88930c3 100755 --- a/pagure/hooks/files/git_multimail.py +++ b/pagure/hooks/files/git_multimail.py @@ -424,7 +424,7 @@ class Config(object): self.section, name)], env=self.env, keepends=True, )) - except CommandError, e: + except CommandError as e: if e.retcode == 1: # "the section or key is invalid"; i.e., there is no # value for the specified key. @@ -465,7 +465,7 @@ class Config(object): ['config', '--unset-all', '%s.%s' % (self.section, name)], env=self.env, ) - except CommandError, e: + except CommandError as e: if e.retcode == 5: # The name doesn't exist, which is what we wanted anyway... pass @@ -644,7 +644,7 @@ class Change(object): try: value = value % values - except KeyError, e: + except KeyError as e: if DEBUG: sys.stderr.write( 'Warning: unknown variable %r in the following ' @@ -1403,7 +1403,7 @@ class SendMailer(Mailer): def send(self, lines, to_addrs): try: p = subprocess.Popen(self.command, stdin=subprocess.PIPE) - except OSError, e: + except OSError as e: sys.stderr.write( '*** Cannot execute command: %s\n' % ' '.join(self.command) + '*** %s\n' % str(e) @@ -1443,7 +1443,7 @@ class SMTPMailer(Mailer): self.smtpserver = smtpserver try: self.smtp = smtplib.SMTP(self.smtpserver) - except Exception, e: + except Exception as e: sys.stderr.write( '*** Error establishing SMTP connection to %s***\n' % self.smtpserver) @@ -1461,7 +1461,7 @@ class SMTPMailer(Mailer): to_addrs = [ email for (name, email) in getaddresses([to_addrs])] self.smtp.sendmail(self.envelopesender, to_addrs, msg) - except Exception, e: + except Exception as e: sys.stderr.write('*** Error sending email***\n') sys.stderr.write('*** %s\n' % str(e)) self.smtp.quit() @@ -2581,7 +2581,7 @@ def main(args): run_as_update_hook(environment, mailer, refname, oldrev, newrev) else: run_as_post_receive_hook(environment, mailer) - except ConfigurationException, e: + except ConfigurationException as e: sys.exit(str(e)) diff --git a/pagure/hooks/files/pagure_hook.py b/pagure/hooks/files/pagure_hook.py index 329293e..d1c6234 100755 --- a/pagure/hooks/files/pagure_hook.py +++ b/pagure/hooks/files/pagure_hook.py @@ -80,7 +80,7 @@ def relates_commit(commitid, issue, app_url=None): pagure.SESSION.commit() except pagure.exceptions.PagureException as err: print err - except SQLAlchemyError, err: # pragma: no cover + except SQLAlchemyError as err: # pragma: no cover pagure.SESSION.rollback() pagure.APP.logger.exception(err) @@ -112,7 +112,7 @@ def fixes_commit(commitid, issue, app_url=None): pagure.SESSION.commit() except pagure.exceptions.PagureException as err: print err - except SQLAlchemyError, err: # pragma: no cover + except SQLAlchemyError as err: # pragma: no cover pagure.SESSION.rollback() pagure.APP.logger.exception(err) @@ -133,7 +133,7 @@ def fixes_commit(commitid, issue, app_url=None): pagure.SESSION.commit() except pagure.exceptions.PagureException as err: print err - except SQLAlchemyError, err: # pragma: no cover + except SQLAlchemyError as err: # pragma: no cover pagure.SESSION.rollback() pagure.APP.logger.exception(err) diff --git a/pagure/internal/__init__.py b/pagure/internal/__init__.py index 1ba402a..4f38d78 100644 --- a/pagure/internal/__init__.py +++ b/pagure/internal/__init__.py @@ -109,7 +109,7 @@ def pull_request_add_comment(): requestfolder=pagure.APP.config['REQUESTS_FOLDER'], ) pagure.SESSION.commit() - except SQLAlchemyError, err: # pragma: no cover + except SQLAlchemyError as err: # pragma: no cover pagure.SESSION.rollback() pagure.APP.logger.exception(err) flask.abort(500, 'Error when saving the request to the database') @@ -164,7 +164,7 @@ def ticket_add_comment(): ticketfolder=pagure.APP.config['TICKETS_FOLDER'], notify=True) pagure.SESSION.commit() - except SQLAlchemyError, err: # pragma: no cover + except SQLAlchemyError as err: # pragma: no cover pagure.SESSION.rollback() pagure.APP.logger.exception(err) flask.abort(500, 'Error when saving the request to the database') diff --git a/pagure/lib/notify.py b/pagure/lib/notify.py index 19c4a58..9fd2a93 100644 --- a/pagure/lib/notify.py +++ b/pagure/lib/notify.py @@ -40,7 +40,7 @@ def fedmsg_publish(*args, **kwargs): # pragma: no cover try: import fedmsg fedmsg.publish(*args, **kwargs) - except Exception, err: + except Exception as err: warnings.warn(str(err)) diff --git a/pagure/ui/admin.py b/pagure/ui/admin.py index 2588f5b..776f299 100644 --- a/pagure/ui/admin.py +++ b/pagure/ui/admin.py @@ -65,7 +65,7 @@ def admin_generate_acl(): try: pagure.lib.git.generate_gitolite_acls() flask.flash('Gitolite ACLs updated') - except pagure.exceptions.PagureException, err: + except pagure.exceptions.PagureException as err: flask.flash(str(err), 'error') return flask.redirect(flask.url_for('admin_index')) @@ -80,7 +80,7 @@ def admin_refresh_ssh(): generate_user_key_files() pagure.lib.git.generate_gitolite_acls() flask.flash('User key files regenerated') - except pagure.exceptions.PagureException, err: + except pagure.exceptions.PagureException as err: flask.flash(str(err), 'error') return flask.redirect(flask.url_for('admin_index')) diff --git a/pagure/ui/app.py b/pagure/ui/app.py index a0ab3db..331d959 100644 --- a/pagure/ui/app.py +++ b/pagure/ui/app.py @@ -361,9 +361,9 @@ def new_project(): pagure.lib.git.generate_gitolite_acls() flask.flash(message) return flask.redirect(flask.url_for('view_repo', repo=name)) - except pagure.exceptions.PagureException, err: + except pagure.exceptions.PagureException as err: flask.flash(str(err), 'error') - except SQLAlchemyError, err: # pragma: no cover + except SQLAlchemyError as err: # pragma: no cover SESSION.rollback() flask.flash(str(err), 'error') @@ -406,7 +406,7 @@ def user_settings(): flask.flash(message) return flask.redirect( flask.url_for('view_user', username=user.user)) - except SQLAlchemyError, err: # pragma: no cover + except SQLAlchemyError as err: # pragma: no cover SESSION.rollback() flask.flash(str(err), 'error') elif flask.request.method == 'GET': @@ -514,7 +514,7 @@ def add_user_email(): SESSION.commit() flask.flash('Email pending validation') return flask.redirect(flask.url_for('.user_settings')) - except pagure.exceptions.PagureException, err: + except pagure.exceptions.PagureException as err: flask.flash(str(err), 'error') except SQLAlchemyError as err: # pragma: no cover SESSION.rollback() @@ -586,7 +586,7 @@ def confirm_email(token): SESSION.delete(email) SESSION.commit() flask.flash('Email validated') - except SQLAlchemyError, err: # pragma: no cover + except SQLAlchemyError as err: # pragma: no cover SESSION.rollback() flask.flash( 'Could not set the account as active in the db, ' diff --git a/pagure/ui/fork.py b/pagure/ui/fork.py index b92b63e..84c0e97 100644 --- a/pagure/ui/fork.py +++ b/pagure/ui/fork.py @@ -448,7 +448,7 @@ def pull_request_add_comment( SESSION.commit() if not is_js: flask.flash(message) - except SQLAlchemyError, err: # pragma: no cover + except SQLAlchemyError as err: # pragma: no cover SESSION.rollback() APP.logger.exception(err) flask.flash(str(err), 'error') @@ -522,7 +522,7 @@ def pull_request_drop_comment(repo, requestid, username=None): try: SESSION.commit() flask.flash('Comment removed') - except SQLAlchemyError, err: # pragma: no cover + except SQLAlchemyError as err: # pragma: no cover SESSION.rollback() LOG.error(err) flask.flash( @@ -694,10 +694,10 @@ def set_assignee_requests(repo, requestid, username=None): if message: SESSION.commit() flask.flash(message) - except pagure.exceptions.PagureException, err: + except pagure.exceptions.PagureException as err: SESSION.rollback() flask.flash(err.message, 'error') - except SQLAlchemyError, err: # pragma: no cover + except SQLAlchemyError as err: # pragma: no cover SESSION.rollback() APP.logger.exception(err) flask.flash(str(err), 'error') @@ -752,9 +752,9 @@ def fork_project(repo, username=None): username=flask.g.fas_user.username, repo=repo.name) ) - except pagure.exceptions.PagureException, err: + except pagure.exceptions.PagureException as err: flask.flash(str(err), 'error') - except SQLAlchemyError, err: # pragma: no cover + except SQLAlchemyError as err: # pragma: no cover SESSION.rollback() flask.flash(str(err), 'error') @@ -848,12 +848,12 @@ def new_request_pull(repo, branch_to, branch_from, username=None): username=parent.user, repo=parent.name) return flask.redirect(url) - except pagure.exceptions.PagureException, err: # pragma: no cover + except pagure.exceptions.PagureException as err: # pragma: no cover # There could be a PagureException thrown if the flask.g.fas_user # wasn't in the DB but then it shouldn't be recognized as a # repo admin and thus, if we ever are here, we are in trouble. flask.flash(str(err), 'error') - except SQLAlchemyError, err: # pragma: no cover + except SQLAlchemyError as err: # pragma: no cover SESSION.rollback() flask.flash(str(err), 'error') @@ -986,13 +986,13 @@ def new_remote_request_pull(repo, username=None): username=parent.user, repo=parent.name) return flask.redirect(url) - except pagure.exceptions.PagureException, err: # pragma: no cover + except pagure.exceptions.PagureException as err: # pragma: no cover # There could be a PagureException thrown if the # flask.g.fas_user wasn't in the DB but then it shouldn't # be recognized as a repo admin and thus, if we ever are # here, we are in trouble. flask.flash(str(err), 'error') - except SQLAlchemyError, err: # pragma: no cover + except SQLAlchemyError as err: # pragma: no cover SESSION.rollback() flask.flash(str(err), 'error') diff --git a/pagure/ui/groups.py b/pagure/ui/groups.py index a4d16e2..5582b6d 100644 --- a/pagure/ui/groups.py +++ b/pagure/ui/groups.py @@ -84,7 +84,7 @@ def view_group(group): pagure.SESSION.commit() pagure.lib.git.generate_gitolite_acls() flask.flash(msg) - except pagure.exceptions.PagureException, err: + except pagure.exceptions.PagureException as err: pagure.SESSION.rollback() flask.flash(err.message, 'error') return flask.redirect( @@ -136,7 +136,7 @@ def group_user_delete(user, group): pagure.lib.git.generate_gitolite_acls() flask.flash( 'User `%s` removed from the group `%s`' % (user, group)) - except pagure.exceptions.PagureException, err: + except pagure.exceptions.PagureException as err: pagure.SESSION.rollback() flask.flash(err.message, 'error') return flask.redirect( @@ -236,7 +236,7 @@ def add_group(): flask.flash('Group `%s` created.' % group_name) flask.flash(msg) return flask.redirect(flask.url_for('.group_lists')) - except pagure.exceptions.PagureException, err: + except pagure.exceptions.PagureException as err: pagure.SESSION.rollback() flask.flash(err.message, 'error') except SQLAlchemyError as err: # pragma: no cover diff --git a/pagure/ui/issues.py b/pagure/ui/issues.py index c28bc8b..0642cde 100644 --- a/pagure/ui/issues.py +++ b/pagure/ui/issues.py @@ -92,7 +92,7 @@ def update_issue(repo, issueid, username=None): SESSION.commit() if not is_js: flask.flash('Comment removed') - except SQLAlchemyError, err: # pragma: no cover + except SQLAlchemyError as err: # pragma: no cover is_js = False SESSION.rollback() LOG.error(err) @@ -198,12 +198,12 @@ def update_issue(repo, issueid, username=None): for message in messages: flask.flash(message) - except pagure.exceptions.PagureException, err: + except pagure.exceptions.PagureException as err: is_js = False SESSION.rollback() if not is_js: flask.flash(err.message, 'error') - except SQLAlchemyError, err: # pragma: no cover + except SQLAlchemyError as err: # pragma: no cover is_js = False SESSION.rollback() APP.logger.exception(err) @@ -249,7 +249,7 @@ def edit_tag(repo, tag, username=None): SESSION.commit() for msg in msgs: flask.flash(msg) - except SQLAlchemyError, err: # pragma: no cover + except SQLAlchemyError as err: # pragma: no cover SESSION.rollback() LOG.error(err) flask.flash('Could not edit tag: %s' % tag, 'error') @@ -297,7 +297,7 @@ def remove_tag(repo, username=None): SESSION.commit() for msg in msgs: flask.flash(msg) - except SQLAlchemyError, err: # pragma: no cover + except SQLAlchemyError as err: # pragma: no cover SESSION.rollback() LOG.error(err) flask.flash( @@ -461,9 +461,9 @@ def new_issue(repo, username=None): return flask.redirect(flask.url_for( '.view_issue', username=username, repo=repo.name, issueid=issue.id)) - except pagure.exceptions.PagureException, err: + except pagure.exceptions.PagureException as err: flask.flash(str(err), 'error') - except SQLAlchemyError, err: # pragma: no cover + except SQLAlchemyError as err: # pragma: no cover SESSION.rollback() flask.flash(str(err), 'error') @@ -558,7 +558,7 @@ def delete_issue(repo, issueid, username=None): flask.flash('Issue deleted') return flask.redirect(flask.url_for( 'view_issues', username=username, repo=repo.name)) - except SQLAlchemyError, err: # pragma: no cover + except SQLAlchemyError as err: # pragma: no cover SESSION.rollback() APP.logger.exception(err) flask.flash('Could not delete the issue', 'error') @@ -646,9 +646,9 @@ def edit_issue(repo, issueid, username=None): 'view_issue', username=username, repo=repo.name, issueid=issueid) return flask.redirect(url) - except pagure.exceptions.PagureException, err: + except pagure.exceptions.PagureException as err: flask.flash(str(err), 'error') - except SQLAlchemyError, err: # pragma: no cover + except SQLAlchemyError as err: # pragma: no cover SESSION.rollback() flask.flash(str(err), 'error') elif flask.request.method == 'GET': diff --git a/pagure/ui/login.py b/pagure/ui/login.py index 162da40..02360ec 100644 --- a/pagure/ui/login.py +++ b/pagure/ui/login.py @@ -128,7 +128,7 @@ def do_login(): flask.g.fas_session_id = visit_key flask.g.fas_user.login_time = now flask.flash('Welcome %s' % user_obj.username) - except SQLAlchemyError, err: # pragma: no cover + except SQLAlchemyError as err: # pragma: no cover flask.flash( 'Could not set the session in the db, ' 'please report this error to an admin', 'error') @@ -156,7 +156,7 @@ def confirm_user(token): SESSION.commit() flask.flash('Email confirmed, account activated') return flask.redirect(flask.url_for('auth_login')) - except SQLAlchemyError, err: # pragma: no cover + except SQLAlchemyError as err: # pragma: no cover flask.flash( 'Could not set the account as active in the db, ' 'please report this error to an admin', 'error') @@ -371,7 +371,7 @@ def _check_session_cookie(): SESSION.add(session) try: SESSION.commit() - except SQLAlchemyError, err: # pragma: no cover + except SQLAlchemyError as err: # pragma: no cover flask.flash( 'Could not prolong the session in the db, ' 'please report this error to an admin', 'error') diff --git a/pagure/ui/plugins.py b/pagure/ui/plugins.py index 7ff7500..701cf85 100644 --- a/pagure/ui/plugins.py +++ b/pagure/ui/plugins.py @@ -105,7 +105,7 @@ def view_plugin(repo, plugin, username=None, full=True): SESSION.add(dbobj) try: SESSION.flush() - except SQLAlchemyError, err: # pragma: no cover + except SQLAlchemyError as err: # pragma: no cover SESSION.rollback() APP.logger.debug('Could not add plugin %s', plugin.name) APP.logger.exception(err) diff --git a/pagure/ui/repo.py b/pagure/ui/repo.py index 63f316d..3139c67 100644 --- a/pagure/ui/repo.py +++ b/pagure/ui/repo.py @@ -809,7 +809,7 @@ def view_settings(repo, username=None): except pagure.exceptions.PagureException as msg: SESSION.rollback() flask.flash(msg, 'error') - except SQLAlchemyError, err: # pragma: no cover + except SQLAlchemyError as err: # pragma: no cover SESSION.rollback() flask.flash(str(err), 'error') @@ -872,7 +872,7 @@ def update_project(repo, username=None): SESSION.add(repo) SESSION.commit() flask.flash('Project updated') - except SQLAlchemyError, err: # pragma: no cover + except SQLAlchemyError as err: # pragma: no cover SESSION.rollback() flask.flash(str(err), 'error') @@ -954,7 +954,7 @@ def delete_repo(repo, username=None): SESSION.delete(issue) SESSION.delete(repo) SESSION.commit() - except SQLAlchemyError, err: # pragma: no cover + except SQLAlchemyError as err: # pragma: no cover SESSION.rollback() APP.logger.exception(err) flask.flash('Could not delete the project', 'error') @@ -971,7 +971,7 @@ def delete_repo(repo, username=None): shutil.rmtree(docpath) shutil.rmtree(ticketpath) shutil.rmtree(requestpath) - except (OSError, IOError), err: + except (OSError, IOError) as err: APP.logger.exception(err) flask.flash( 'Could not delete all the repos from the system', 'error') @@ -1014,7 +1014,7 @@ def new_repo_hook_token(repo, username=None): repo.hook_token = pagure.lib.login.id_generator(40) SESSION.commit() flask.flash('New hook token generated') - except SQLAlchemyError, err: # pragma: no cover + except SQLAlchemyError as err: # pragma: no cover SESSION.rollback() APP.logger.exception(err) flask.flash('Could not generate a new token for this project', 'error') @@ -1468,7 +1468,7 @@ def delete_branch(repo, branchname, username=None): branch = repo_git.lookup_branch(branchname) branch.delete() flask.flash('Branch `%s` deleted' % branchname) - except pygit2.GitError, err: + except pygit2.GitError as err: APP.logger.exception(err) flask.flash('Could not delete `%s`' % branchname, 'error') diff --git a/tests/test_progit_flask_ui_plugins.py b/tests/test_progit_flask_ui_plugins.py index 35ae16f..57d01a5 100644 --- a/tests/test_progit_flask_ui_plugins.py +++ b/tests/test_progit_flask_ui_plugins.py @@ -138,7 +138,7 @@ class PagureFlaskPluginstests(tests.Modeltests): try: form.validate() - except Exception, err: + except Exception as err: self.assertEqual( str(err), 'no field named "active" in form')