aboutsummaryrefslogtreecommitdiff
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/xpak.py
parentBug #285637 - Fix NameError exception triggered by InvalidAtom in (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/xpak.py')
-rw-r--r--pym/portage/xpak.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/pym/portage/xpak.py b/pym/portage/xpak.py
index 15a432f51..54d2eb880 100644
--- a/pym/portage/xpak.py
+++ b/pym/portage/xpak.py
@@ -232,7 +232,7 @@ def xpand(myid,mydest):
mydata=myid[1]
try:
origdir=os.getcwd()
- except SystemExit, e:
+ except SystemExit as e:
raise
except:
os.chdir("/")
@@ -313,7 +313,7 @@ class tbz2(object):
# thus the above sanity check.
try:
shutil.rmtree(datadir)
- except OSError, oe:
+ except OSError as oe:
if oe.errno == errno.ENOENT:
pass
else:
@@ -359,7 +359,7 @@ class tbz2(object):
self.datapos=a.tell()
a.close()
return 2
- except SystemExit, e:
+ except SystemExit as e:
raise
except:
return 0
@@ -397,7 +397,7 @@ class tbz2(object):
return 0
try:
origdir=os.getcwd()
- except SystemExit, e:
+ except SystemExit as e:
raise
except:
os.chdir("/")