From: Mao PU <mao.c.pu@googlemail.com> Date: Sun, 17 Oct 2010 18:19:55 +0000 (-0700) Subject: slot_collision.py: Define basestring for python3. X-Git-Tag: v2.2_rc98~1 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=acd7274fd632ab91011eeaca2cefe1644b300dd7;p=portage.git slot_collision.py: Define basestring for python3. --- diff --git a/pym/_emerge/resolver/slot_collision.py b/pym/_emerge/resolver/slot_collision.py index f6cf94d91..347f569e9 100644 --- a/pym/_emerge/resolver/slot_collision.py +++ b/pym/_emerge/resolver/slot_collision.py @@ -3,6 +3,8 @@ from __future__ import print_function +import sys + from _emerge.AtomArg import AtomArg from _emerge.Package import Package from _emerge.PackageArg import PackageArg @@ -12,6 +14,9 @@ from portage._sets.base import InternalPackageSet from portage.util import writemsg from portage.versions import cpv_getversion, vercmp +if sys.hexversion >= 0x3000000: + basestring = str + class slot_conflict_handler(object): """This class keeps track of all slot conflicts and provides an interface to get possible solutions.