Define basestring as str when Python 3 is used.

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

3 files changed, 11 insertions, 0 deletions

diff --git a/pym/portage/cache/metadata.py b/pym/portage/cache/metadata.py
index 8b35593c2..2b8047d43 100644
--- a/pym/portage/cache/metadata.py
+++ b/pym/portage/cache/metadata.py
@@ -5,6 +5,7 @@
 
 import errno
 import re
+import sys
 from portage import os
 from portage import _encodings
 from portage import _unicode_encode
@@ -13,6 +14,9 @@ import portage.eclass_cache
 from portage.cache.template import reconstruct_eclasses
 from portage.cache.mappings import ProtectedDict
 
+if sys.hexversion >= 0x3000000:
+	basestring = str
+
 # this is the old cache format, flat_list.  count maintained here.
 magic_line_count = 22
 
diff --git a/pym/portage/cache/sqlite.py b/pym/portage/cache/sqlite.py
index 073ca2cd8..2bb740722 100644
--- a/pym/portage/cache/sqlite.py
+++ b/pym/portage/cache/sqlite.py
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+import sys
 from portage.cache import fs_template
 from portage.cache import cache_errors
 from portage import os
@@ -15,6 +16,9 @@ except ImportError:
 	from pysqlite2 import dbapi2 as db_module
 DBError = db_module.Error
 
+if sys.hexversion >= 0x3000000:
+	basestring = str
+
 class database(fs_template.FsBased):
 
 	autocommits = False
diff --git a/pym/portage/cache/template.py b/pym/portage/cache/template.py
index d4573c760..7fc4e9495 100644
--- a/pym/portage/cache/template.py
+++ b/pym/portage/cache/template.py
@@ -9,6 +9,9 @@ from portage.cache.mappings import ProtectedDict
 import sys
 import warnings
 
+if sys.hexversion >= 0x3000000:
+	basestring = str
+
 class database(object):
 	# this is for metadata/cache transfer.
 	# basically flags the cache needs be updated when transfered cache to cache.