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/dispatch_conf.py | |
parent | Bug #285637 - Fix NameError exception triggered by InvalidAtom in (diff) | |
download | portage-multirepo-7cb8fb941f09d1ac646be334745f90e16ebd46eb.tar.gz portage-multirepo-7cb8fb941f09d1ac646be334745f90e16ebd46eb.tar.bz2 portage-multirepo-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/dispatch_conf.py')
-rw-r--r-- | pym/portage/dispatch_conf.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pym/portage/dispatch_conf.py b/pym/portage/dispatch_conf.py index 49e53c2e..e9b220a3 100644 --- a/pym/portage/dispatch_conf.py +++ b/pym/portage/dispatch_conf.py @@ -64,7 +64,7 @@ def rcs_archive(archive, curconf, newconf, mrgconf): try: shutil.copy2(curconf, archive) - except(IOError, os.error), why: + except(IOError, os.error) as why: print >> sys.stderr, _('dispatch-conf: Error copying %(curconf)s to %(archive)s: %(reason)s; fatal') % \ {"curconf": curconf, "archive": archive, "reason": str(why)} if os.path.exists(archive + ',v'): @@ -80,7 +80,7 @@ def rcs_archive(archive, curconf, newconf, mrgconf): try: shutil.copy2(newconf, archive) - except(IOError, os.error), why: + except(IOError, os.error) as why: print >> sys.stderr, _('dispatch-conf: Error copying %(newconf)s to %(archive)s: %(reason)s; fatal') % \ {"newconf": newconf, "archive": archive, "reason": str(why)} @@ -123,7 +123,7 @@ def file_archive(archive, curconf, newconf, mrgconf): try: shutil.copy2(curconf, archive) - except(IOError, os.error), why: + except(IOError, os.error) as why: print >> sys.stderr, _('dispatch-conf: Error copying %(curconf)s to %(archive)s: %(reason)s; fatal') % \ {"curconf": curconf, "archive": archive, "reason": str(why)} @@ -131,7 +131,7 @@ def file_archive(archive, curconf, newconf, mrgconf): # Save off new config file in the archive dir with .dist.new suffix try: shutil.copy2(newconf, archive + '.dist.new') - except(IOError, os.error), why: + except(IOError, os.error) as why: print >> sys.stderr, _('dispatch-conf: Error copying %(newconf)s to %(archive)s: %(reason)s; fatal') % \ {"newconf": newconf, "archive": archive + '.dist.new', "reason": str(why)} |