From 0388944a560582abcbf5c7b0257d48918ac11455 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 8 Jun 2011 12:03:25 -0700 Subject: Atom: avoid TypeError with PyPy Our test cases pass in raw bytes here, which causes _atom_base.__init__ to raise TypeError with PyPy. --- pym/portage/dep/__init__.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pym/portage/dep/__init__.py b/pym/portage/dep/__init__.py index 8332a05e4..862154318 100644 --- a/pym/portage/dep/__init__.py +++ b/pym/portage/dep/__init__.py @@ -30,7 +30,7 @@ __all__ = [ import re, sys import warnings from itertools import chain -import portage.exception +from portage import _unicode_decode from portage.eapi import eapi_has_slot_deps, eapi_has_src_uri_arrows, \ eapi_has_use_deps, eapi_has_strong_blocks, eapi_has_use_dep_defaults from portage.exception import InvalidAtom, InvalidData, InvalidDependString @@ -1057,6 +1057,10 @@ class Atom(_atom_base): raise TypeError(_("Expected %s, got %s") % \ (_atom_base, type(s))) + if not isinstance(s, _atom_base): + # Avoid TypeError with from _atom_base.__init__ with PyPy. + s = _unicode_decode(s) + _atom_base.__init__(s) if "!" == s[:1]: -- cgit v1.2.3-1-g7c22