From 2217fb855305dbf2ff875ea94f68c98eed1e02d9 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 13 Dec 2009 03:54:53 +0000 Subject: 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 --- pym/portage/__init__.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3-1-g7c22