diff options
| author |   Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-09-20 10:57:44 +0000 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-09-20 10:57:44 +0000 |
| commit | 7cb8fb941f09d1ac646be334745f90e16ebd46eb (patch) | |
| tree | bad100ba3461c881ebd388d29a6ac859a8962a1a /pym/portage/elog | |
| parent | Bug #285637 - Fix NameError exception triggered by InvalidAtom in (diff) | |
| download | portage-7cb8fb941f09d1ac646be334745f90e16ebd46eb.tar.gz portage-7cb8fb941f09d1ac646be334745f90e16ebd46eb.tar.bz2 portage-7cb8fb941f09d1ac646be334745f90e16ebd46eb.zip | |
Update syntax of 'except' statements for compatibility with Python 3.
(2to3-3.1 -f except -nw ${FILES})
svn path=/main/trunk/; revision=14289
Diffstat (limited to 'pym/portage/elog')
| -rw-r--r-- | pym/portage/elog/__init__.py | 4 | ||||
| -rw-r--r-- | pym/portage/elog/mod_mail.py | 2 | ||||
| -rw-r--r-- | pym/portage/elog/mod_mail_summary.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/pym/portage/elog/__init__.py b/pym/portage/elog/__init__.py index 7bd567cee..c689d821d 100644 --- a/pym/portage/elog/__init__.py +++ b/pym/portage/elog/__init__.py @@ -168,10 +168,10 @@ def elog_process(cpv, mysettings, phasefilter=None): if hasattr(m, "finalize") and not m.finalize in _elog_atexit_handlers: _elog_atexit_handlers.append(m.finalize) atexit_register(m.finalize) - except (ImportError, AttributeError), e: + except (ImportError, AttributeError) as e: writemsg(_("!!! Error while importing logging modules " "while loading \"mod_%s\":\n") % str(s)) writemsg("%s\n" % str(e), noiselevel=-1) - except PortageException, e: + except PortageException as e: writemsg("%s\n" % str(e), noiselevel=-1) diff --git a/pym/portage/elog/mod_mail.py b/pym/portage/elog/mod_mail.py index 841986b96..ac96f3b20 100644 --- a/pym/portage/elog/mod_mail.py +++ b/pym/portage/elog/mod_mail.py @@ -38,7 +38,7 @@ def process(mysettings, key, logentries, fulltext): mymessage = portage.mail.create_message(myfrom, myrecipient, mysubject, fulltext) try: portage.mail.send_mail(mysettings, mymessage) - except PortageException, e: + except PortageException as e: writemsg("%s\n" % str(e), noiselevel=-1) return diff --git a/pym/portage/elog/mod_mail_summary.py b/pym/portage/elog/mod_mail_summary.py index e642dc044..4380146d2 100644 --- a/pym/portage/elog/mod_mail_summary.py +++ b/pym/portage/elog/mod_mail_summary.py @@ -73,7 +73,7 @@ def _finalize(mysettings, items): portage.mail.send_mail(mysettings, mymessage) finally: signal.alarm(0) - except PortageException, e: + except PortageException as e: writemsg("%s\n" % str(e), noiselevel=-1) return |