From: Giacomo Travaglini <giacomo.travaglini@arm.com>
Date: Fri, 28 Feb 2020 14:58:17 +0000 (+0000)
Subject: misc: Replace basestring with six.string_types
X-Git-Tag: v20.0.0.0~407
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=656b18a414b6029f9a3897b635d7b6cc4df2d4bd;p=gem5.git

misc: Replace basestring with six.string_types

Change-Id: I914adb545fe82efed386085d2f191ec54efccbf3
Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/26246
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Maintainer: Jason Lowe-Power <jason@lowepower.com>
Tested-by: kokoro <noreply+kokoro@google.com>
---

diff --git a/src/SConscript b/src/SConscript
index 03fae53c3..0797dba0d 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -156,14 +156,14 @@ class SourceFile(object):
     def __init__(self, source, tags=None, add_tags=None, append=None):
         if tags is None:
             tags='gem5 lib'
-        if isinstance(tags, basestring):
+        if isinstance(tags, six.string_types):
             tags = set([tags])
         if not isinstance(tags, set):
             tags = set(tags)
         self.tags = tags
 
         if add_tags:
-            if isinstance(add_tags, basestring):
+            if isinstance(add_tags, six.string_types):
                 add_tags = set([add_tags])
             if not isinstance(add_tags, set):
                 add_tags = set(add_tags)