From c11b111503430871951be2fd677ea1a68cccfd6b Mon Sep 17 00:00:00 2001 From: FrantiĊĦek Zatloukal Date: Jan 08 2019 09:44:10 +0000 Subject: Use except format compatible with both Python 2 and Python 3 --- diff --git a/blockerbugs/controllers/admin/__init__.py b/blockerbugs/controllers/admin/__init__.py index 5f27570..5ed6132 100644 --- a/blockerbugs/controllers/admin/__init__.py +++ b/blockerbugs/controllers/admin/__init__.py @@ -58,7 +58,7 @@ class ReleaseView(FasAuthModelView): self.session.add(model) self.on_model_change(form, model, True) self.session.commit() - except Exception, ex: + except Exception as ex: flash(gettext('Failed to create model. %(error)s', error=str(ex)), 'error') logging.exception('Failed to create model') @@ -85,7 +85,7 @@ class MilestoneView(FasAuthModelView): self.session.add(model) self.on_model_change(form, model, True) self.session.commit() - except Exception, ex: + except Exception as ex: flash(gettext('Failed to create model. %(error)s', error=str(ex)), 'error') logging.exception('Failed to create model') @@ -126,7 +126,7 @@ class UserInfoView(FasAuthModelView): api_key = model.generate_api_key() self.session.add(model) self.session.commit() - except Exception, ex: + except Exception as ex: flash(gettext('Failed to generate API key. %(error)s', error=str(ex)), 'error') logging.exception('Failed to generate api key') diff --git a/blockerbugs/controllers/admin/build.py b/blockerbugs/controllers/admin/build.py index a13109a..960e215 100644 --- a/blockerbugs/controllers/admin/build.py +++ b/blockerbugs/controllers/admin/build.py @@ -61,7 +61,7 @@ class BuildView(FasAuthModelView): model.spins = form.spins.data self.on_model_change(form, model, False) self.session.commit() - except Exception, ex: + except Exception as ex: flash(gettext('Failed to update model. %(error)s', error=str(ex)), 'error') self.session.rollback() @@ -93,7 +93,7 @@ class BuildView(FasAuthModelView): url_for('.create_view', url=return_url)) else: return redirect(return_url) - except koji.GenericError, ex: + except koji.GenericError as ex: form.nvr.errors.append(ex.message) return self.render(self.create_template, diff --git a/blockerbugs/controllers/api/utils.py b/blockerbugs/controllers/api/utils.py index 64faf55..119d483 100644 --- a/blockerbugs/controllers/api/utils.py +++ b/blockerbugs/controllers/api/utils.py @@ -74,7 +74,7 @@ class JsonResponse(Response): def json_loads(data): try: return json.loads(data) - except (ValueError, TypeError), e: + except (ValueError, TypeError) as e: raise MalformedJSONError(detail=str(e)) diff --git a/blockerbugs/controllers/main.py b/blockerbugs/controllers/main.py index e2a2524..528eac7 100644 --- a/blockerbugs/controllers/main.py +++ b/blockerbugs/controllers/main.py @@ -395,7 +395,7 @@ def fas_bugzilla(): db.session.add(user_info) db.session.commit() return redirect(url_for('.propose_bug')) - except bugzilla.BugzillaError, e: + except bugzilla.BugzillaError as e: app.logger.info(e) flash(e) @@ -444,7 +444,7 @@ def propose_bug(): # check bug to make sure it exists and that it isn't closed try: proposer.check_proposed_bug() - except BZInterfaceError, e: + except BZInterfaceError as e: bugform.bugid.errors = [e.msg] # check to make sure that any proposals aren't being re-done @@ -466,7 +466,7 @@ def propose_bug(): return render_template('thanks.html', bugid=bugid, isblocker=bugform.blocker.data, isfe=bugform.freeze_exception.data) - except BZInterfaceError, e: + except BZInterfaceError as e: bugform.bugid.errors = [e.msg] app.logger.info('bug proposal form errors: %s' % e.msg) else: diff --git a/blockerbugs/util/bug_sync.py b/blockerbugs/util/bug_sync.py index 2e9aef3..eed1c38 100644 --- a/blockerbugs/util/bug_sync.py +++ b/blockerbugs/util/bug_sync.py @@ -71,7 +71,7 @@ class BugSync(): buginfo['needinfo'] = True try: needinfos.append(flag['requestee']) - except KeyError, e: + except KeyError as e: pass buginfo['needinfo_requestee'] = ', '.join(needinfos) diff --git a/blockerbugs/util/bz_interface.py b/blockerbugs/util/bz_interface.py index 6754465..2fe046d 100644 --- a/blockerbugs/util/bz_interface.py +++ b/blockerbugs/util/bz_interface.py @@ -170,7 +170,7 @@ class BlockerProposal(): # get bug data, will raise XMLRPC fault if the bug does not exist try: self.bugdata = self.bz.getbug(self.bugid) - except Fault, e: + except Fault as e: if e.faultCode == 101: raise BZInterfaceError(e.faultString) else: @@ -198,7 +198,7 @@ class BlockerProposal(): self.log.info('comment: %s' % comment) try: self._do_proposal(tracker_bugs, self.bugid, ' '.join(comment), self.bz_user) - except Fault, e: + except Fault as e: if e.faultCode == 51: # bugzilla account does not exist, this should happen very rarely, if ever # so just redo the call with nothing to add to cc diff --git a/blockerbugs/util/update_sync.py b/blockerbugs/util/update_sync.py index d64177f..37caa7a 100644 --- a/blockerbugs/util/update_sync.py +++ b/blockerbugs/util/update_sync.py @@ -120,7 +120,7 @@ class UpdateSync(object): ) try: result = self.bodhi_interface.query(**queries_data) - except bodhi.BodhiClientException, e: + except bodhi.BodhiClientException as e: # ignore invalid release error so it doesn't blow up when # bug trackers for a release not present in bodhi are added if 'Invalid releases' in str(e): @@ -159,7 +159,7 @@ class UpdateSync(object): self.log.debug('searching for updates for bugs %s' % str(bugs_ids)) try: updates = self.search_updates(bugs_ids, release.number) - except ServerError, ex: + except ServerError as ex: self.log.error( 'f{r.number} sync updates failed: {e.code} {e.msg}'.format( e=ex, r=release)) diff --git a/testing/test_validators.py b/testing/test_validators.py index 38207b6..ea263fb 100644 --- a/testing/test_validators.py +++ b/testing/test_validators.py @@ -76,19 +76,19 @@ class TestValidators(object): invalid_data = 'abc' try: int_validator(invalid_data) - except ValidationError, e: + except ValidationError as e: assert 'test' in str(e) dict_validator = validators.DictValidator({ 'test_name': validators.ConstValidator('333') }) try: dict_validator({}) - except ValidationError, e: + except ValidationError as e: assert 'test_name' in str(e) str_validator = validators.StringValidator() try: str_validator({}) - except ValidationError, e: + except ValidationError as e: assert str_validator.default_name in str(e) def test_choices(self):