summaryrefslogtreecommitdiffstats
path: root/pym/_emerge/BlockerCache.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/_emerge/BlockerCache.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/_emerge/BlockerCache.py')
-rw-r--r--pym/_emerge/BlockerCache.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/pym/_emerge/BlockerCache.py b/pym/_emerge/BlockerCache.py
index 2af47ca85..db16fa83a 100644
--- a/pym/_emerge/BlockerCache.py
+++ b/pym/_emerge/BlockerCache.py
@@ -55,7 +55,7 @@ class BlockerCache(portage.cache.mappings.MutableMapping):
self._cache_data = mypickle.load()
f.close()
del f
- except (IOError, OSError, EOFError, ValueError, pickle.UnpicklingError), e:
+ except (IOError, OSError, EOFError, ValueError, pickle.UnpicklingError) as e:
if isinstance(e, pickle.UnpicklingError):
writemsg("!!! Error loading '%s': %s\n" % \
(self._cache_filename, str(e)), noiselevel=-1)
@@ -140,7 +140,7 @@ class BlockerCache(portage.cache.mappings.MutableMapping):
f.close()
portage.util.apply_secpass_permissions(
self._cache_filename, gid=portage.portage_gid, mode=0644)
- except (IOError, OSError), e:
+ except (IOError, OSError) as e:
pass
self._modified.clear()