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 /bin/dispatch-conf | |
| parent | e70e41916899163fb28a1f5fa24c0ee2b17707f7 (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 'bin/dispatch-conf')
| -rwxr-xr-x | bin/dispatch-conf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/dispatch-conf b/bin/dispatch-conf index 68fd3e899..d0309701e 100755 --- a/bin/dispatch-conf +++ b/bin/dispatch-conf @@ -51,7 +51,7 @@ while SCRATCH_DIR is None: continue os.mkdir(mydir) SCRATCH_DIR = mydir - except OSError, e: + except OSError as e: if e.errno != 17: raise os.umask(oldmask) @@ -305,7 +305,7 @@ class dispatch: os.system((DIFF_CONTENTS % (curconf, newconf)) + '>>' + self.options["log-file"]) try: os.rename(newconf, curconf) - except (IOError, os.error), why: + except (IOError, os.error) as why: print >> sys.stderr, 'dispatch-conf: Error renaming %s to %s: %s; fatal' % \ (newconf, curconf, str(why)) |