From 0c98fa55401c7e1cb4fb1fc4c3c79ae77440f215 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 12 Dec 2009 18:56:35 +0000 Subject: Bug #296641 - Avoid UnicodeEncodeError with python2 in eapi_is_supported() triggered by corrupt EAPI. svn path=/main/trunk/; revision=15055 --- 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 69533c7c0..0e26acbc8 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