From a347a1a68b8a6e370334be3a1d2d66675891e0f1 Mon Sep 17 00:00:00 2001 From: Andreas Sandberg Date: Sat, 26 Jan 2019 14:08:20 +0000 Subject: python: Stop using basestring to test for strings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The base class basestring doesn't exist in Python 3. Use string_types from six instead. Change-Id: I7e84903fb7dd4a0af7ae4e9f4ec2e54338f212bb Signed-off-by: Andreas Sandberg Reviewed-on: https://gem5-review.googlesource.com/c/15998 Reviewed-by: Nikos Nikoleris Reviewed-by: Juha Jäykkä --- src/mem/slicc/util.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/mem/slicc') diff --git a/src/mem/slicc/util.py b/src/mem/slicc/util.py index 3a0cf5f35..dcb780d6b 100644 --- a/src/mem/slicc/util.py +++ b/src/mem/slicc/util.py @@ -25,6 +25,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. from __future__ import print_function +from six import string_types import os import sys @@ -49,7 +50,7 @@ class PairContainer(object): class Location(object): def __init__(self, filename, lineno, no_warning=False): - if not isinstance(filename, basestring): + if not isinstance(filename, string_types): raise AttributeError, \ "filename must be a string, found '%s'" % (type(filename), ) if not isinstance(lineno, (int, long)): -- cgit v1.2.3