diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-12-13 03:54:53 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-12-13 03:54:53 +0000 |
| commit | 2217fb855305dbf2ff875ea94f68c98eed1e02d9 (patch) | |
| tree | c34fb02651fb3f62509cfa937b32d50d02dc5b90 | |
| parent | fec3573d246b14f0d1f57ee1febc7364c580ee7b (diff) | |
| download | portage-2217fb855305dbf2ff875ea94f68c98eed1e02d9.tar.gz portage-2217fb855305dbf2ff875ea94f68c98eed1e02d9.tar.bz2 portage-2217fb855305dbf2ff875ea94f68c98eed1e02d9.zip | |
Bug #296641 - Avoid UnicodeEncodeError with python2 in eapi_is_supported()
triggered by corrupt EAPI. (trunk r15055)
svn path=/main/branches/2.1.7/; revision=15088
| -rw-r--r-- | pym/portage/__init__.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 8b5e89bb7..4846b3ae4 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -6080,7 +6080,11 @@ def _eapi_is_deprecated(eapi): return eapi in _deprecated_eapis def eapi_is_supported(eapi): - eapi = str(eapi).strip() + if not isinstance(eapi, basestring): + # Only call str() when necessary since with python2 it + # can trigger UnicodeEncodeError if EAPI is corrupt. + eapi = str(eapi) + eapi = eapi.strip() if _eapi_is_deprecated(eapi): return True |