summaryrefslogtreecommitdiffstats
path: root/pym/portage/manifest.py
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2009-09-20 10:57:44 +0000
committerArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2009-09-20 10:57:44 +0000
commit7cb8fb941f09d1ac646be334745f90e16ebd46eb (patch)
treebad100ba3461c881ebd388d29a6ac859a8962a1a /pym/portage/manifest.py
parente70e41916899163fb28a1f5fa24c0ee2b17707f7 (diff)
downloadportage-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/manifest.py')
-rw-r--r--pym/portage/manifest.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/pym/portage/manifest.py b/pym/portage/manifest.py
index 25893d759..e60850e5f 100644
--- a/pym/portage/manifest.py
+++ b/pym/portage/manifest.py
@@ -151,7 +151,7 @@ class Manifest(object):
self._parseDigests(fd, myhashdict=myhashdict, **kwargs)
fd.close()
return myhashdict
- except (OSError, IOError), e:
+ except (OSError, IOError) as e:
if e.errno == errno.ENOENT:
raise FileNotFound(file_path)
else:
@@ -243,7 +243,7 @@ class Manifest(object):
if oldentries[i] != myentries[i]:
update_manifest = True
break
- except (IOError, OSError), e:
+ except (IOError, OSError) as e:
if e.errno == errno.ENOENT:
pass
else:
@@ -253,7 +253,7 @@ class Manifest(object):
"".join("%s\n" % str(myentry) for myentry in myentries))
if sign:
self.sign()
- except (IOError, OSError), e:
+ except (IOError, OSError) as e:
if e.errno == errno.EACCES:
raise PermissionDenied(str(e))
raise
@@ -435,7 +435,7 @@ class Manifest(object):
if not ok:
raise DigestException(tuple([self._getAbsname(ftype, fname)]+list(reason)))
return ok, reason
- except FileNotFound, e:
+ except FileNotFound as e:
if not ignoreMissing:
raise
return False, _("File Not Found: '%s'") % str(e)