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/cache/metadata.py | |
| 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 'pym/portage/cache/metadata.py')
| -rw-r--r-- | pym/portage/cache/metadata.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pym/portage/cache/metadata.py b/pym/portage/cache/metadata.py index ff1227bdb..8b35593c2 100644 --- a/pym/portage/cache/metadata.py +++ b/pym/portage/cache/metadata.py @@ -61,7 +61,7 @@ class database(flat_hash.database): try: d["_eclasses_"] = self.ec.get_eclass_data( d["INHERITED"].split()) - except KeyError, e: + except KeyError as e: # INHERITED contains a non-existent eclass. raise cache_errors.CacheCorruption(cpv, e) del d["INHERITED"] @@ -122,13 +122,13 @@ class database(flat_hash.database): try: myf = open(_unicode_encode(fp, encoding=_encodings['fs'], errors='strict'), 'wb') - except EnvironmentError, e: + except EnvironmentError as e: if errno.ENOENT == e.errno: try: self._ensure_dirs(cpv) myf = open(_unicode_encode(fp, encoding=_encodings['fs'], errors='strict'), 'wb') - except EnvironmentError, e: + except EnvironmentError as e: raise cache_errors.CacheCorruption(cpv, e) else: raise cache_errors.CacheCorruption(cpv, e) @@ -141,7 +141,7 @@ class database(flat_hash.database): try: os.rename(fp, new_fp) - except EnvironmentError, e: + except EnvironmentError as e: try: os.unlink(fp) except EnvironmentError: |