Andreas Sandberg has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/15998
Change subject: python: Stop using basestring to test for strings
......................................................................
python: Stop using basestring to test for strings
The base class basestring doesn't exist in Python 3. Use string_types
from six instead.
Change-Id: I7e84903fb7dd4a0af7ae4e9f4ec2e54338f212bb
Signed-off-by: Andreas Sandberg <[email protected]>
---
M src/mem/qos/QoSPolicy.py
M src/mem/slicc/util.py
M src/python/m5/util/grammar.py
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/mem/qos/QoSPolicy.py b/src/mem/qos/QoSPolicy.py
index 6db04ac..be18cd6 100644
--- a/src/mem/qos/QoSPolicy.py
+++ b/src/mem/qos/QoSPolicy.py
@@ -35,6 +35,8 @@
#
# Authors: Giacomo Travaglini
+from six import string_types
+
from m5.SimObject import *
from m5.params import *
@@ -71,7 +73,7 @@
for mprio in self._mpriorities:
master = mprio[0]
priority = mprio[1]
- if isinstance(master, basestring):
+ if isinstance(master, string_types):
self.getCCObject().initMasterName(
master, int(priority))
else:
@@ -108,7 +110,7 @@
for mprio in self._mscores:
master = mprio[0]
score = mprio[1]
- if isinstance(master, basestring):
+ if isinstance(master, string_types):
self.getCCObject().initMasterName(
master, float(score))
else:
diff --git a/src/mem/slicc/util.py b/src/mem/slicc/util.py
index 3a0cf5f..dcb780d 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 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)):
diff --git a/src/python/m5/util/grammar.py b/src/python/m5/util/grammar.py
index bb34298..15902d7 100644
--- a/src/python/m5/util/grammar.py
+++ b/src/python/m5/util/grammar.py
@@ -25,6 +25,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import os
+from six import string_types
import ply.lex
import ply.yacc
@@ -93,7 +94,7 @@
"'%s' object has no attribute '%s'" % (type(self), attr))
def parse_string(self, data, source='<string>', debug=None,
tracking=0):
- if not isinstance(data, basestring):
+ if not isinstance(data, string_types):
raise AttributeError(
"argument must be a string, was '%s'" % type(f))
@@ -113,7 +114,7 @@
return result
def parse_file(self, f, **kwargs):
- if isinstance(f, basestring):
+ if isinstance(f, string_types):
source = f
f = file(f, 'r')
elif isinstance(f, file):
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/15998
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-Change-Id: I7e84903fb7dd4a0af7ae4e9f4ec2e54338f212bb
Gerrit-Change-Number: 15998
Gerrit-PatchSet: 1
Gerrit-Owner: Andreas Sandberg <[email protected]>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
