Define basestring as str when Python 3 is used.

svn path=/main/trunk/; revision=14316

6 files changed, 22 insertions, 0 deletions

diff --git a/pym/_emerge/BlockerCache.py b/pym/_emerge/BlockerCache.py
index 9962ffdd5..c4270242f 100644
--- a/pym/_emerge/BlockerCache.py
+++ b/pym/_emerge/BlockerCache.py
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+import sys
 from portage.util import writemsg
 from portage.data import secpass
 import portage
@@ -12,6 +13,9 @@ try:
 except ImportError:
 	import pickle
 
+if sys.hexversion >= 0x3000000:
+	basestring = str
+
 class BlockerCache(portage.cache.mappings.MutableMapping):
 	"""This caches blockers of installed packages so that dep_check does not
 	have to be done for every single installed package on every invocation of
diff --git a/pym/_emerge/JobStatusDisplay.py b/pym/_emerge/JobStatusDisplay.py
index f543d00bb..fbda727ee 100644
--- a/pym/_emerge/JobStatusDisplay.py
+++ b/pym/_emerge/JobStatusDisplay.py
@@ -21,6 +21,9 @@ from portage.output import xtermTitle
 
 from _emerge.getloadavg import getloadavg
 
+if sys.hexversion >= 0x3000000:
+	basestring = str
+
 class JobStatusDisplay(object):
 
 	_bound_properties = ("curval", "failed", "running")
diff --git a/pym/_emerge/Package.py b/pym/_emerge/Package.py
index a38edbd0d..0ea119ef8 100644
--- a/pym/_emerge/Package.py
+++ b/pym/_emerge/Package.py
@@ -3,12 +3,16 @@
 # $Id$
 
 import re
+import sys
 from itertools import chain
 import portage
 from portage.dep import paren_reduce, use_reduce, \
 	paren_normalize, paren_enclose
 from _emerge.Task import Task
 
+if sys.hexversion >= 0x3000000:
+	basestring = str
+
 class Package(Task):
 
 	__hash__ = Task.__hash__
diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py
index aa0a08475..83ffd4b9f 100644
--- a/pym/_emerge/Scheduler.py
+++ b/pym/_emerge/Scheduler.py
@@ -45,6 +45,9 @@ from _emerge.RootConfig import RootConfig
 from _emerge.SlotObject import SlotObject
 from _emerge.SequentialTaskQueue import SequentialTaskQueue
 
+if sys.hexversion >= 0x3000000:
+	basestring = str
+
 class Scheduler(PollScheduler):
 
 	_opts_ignore_blockers = \
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 0585b9c28..af609a0e4 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -51,6 +51,9 @@ from _emerge.show_invalid_depstring_notice import show_invalid_depstring_notice
 from _emerge.UnmergeDepPriority import UnmergeDepPriority
 from _emerge.visible import visible
 
+if sys.hexversion >= 0x3000000:
+	basestring = str
+
 class _frozen_depgraph_config(object):
 
 	def __init__(self, settings, trees, myopts, spinner):
diff --git a/pym/_emerge/format_size.py b/pym/_emerge/format_size.py
index f48d11b17..ff1aeb23f 100644
--- a/pym/_emerge/format_size.py
+++ b/pym/_emerge/format_size.py
@@ -2,6 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+import sys
+
+if sys.hexversion >= 0x3000000:
+	basestring = str
+
 # formats a size given in bytes nicely
 def format_size(mysize):
 	if isinstance(mysize, basestring):