summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pym/_emerge/resolver/slot_collision.py5
1 files changed, 5 insertions, 0 deletions
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.