summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabe Black <gabeblack@google.com>2017-05-05 18:05:36 -0700
committerGabe Black <gabeblack@google.com>2017-05-08 08:54:33 +0000
commitb043f37b67b370e723b7ea11e6c71204291b2bc6 (patch)
treeff9fbf47d098a6b952e34b843503fda833ae992a
parentc40ebea9f4188f8c1ecd04d022b4e7ca60b1d185 (diff)
downloadgem5-b043f37b67b370e723b7ea11e6c71204291b2bc6.tar.xz
scons: Replace str(foo.get_contents()) with foo.get_text_contents().
For Value() nodes, the get_contents() method and the get_text_contents() method are just aliases to the same thing, both of which return a value which has already been converted using str(). The str() which was included explicitly in the SConscript was redundant, except that it showed that the value from get_contents was being treated as a string. To avoid the redundancy but to still leave a hint to the value's type, this change converts those bits of code to use get_text_contents() and removes the str(). Change-Id: I8f7da9b652f749e741b553c9a0e2248ae15ec3ca Reviewed-on: https://gem5-review.googlesource.com/3084 Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com> Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
-rwxr-xr-xsrc/SConscript8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/SConscript b/src/SConscript
index c15da03ac..155dcf53d 100755
--- a/src/SConscript
+++ b/src/SConscript
@@ -610,7 +610,7 @@ PySource('m5', 'python/m5/info.py')
def createSimObjectParamStruct(target, source, env):
assert len(target) == 1 and len(source) == 1
- name = str(source[0].get_contents())
+ name = source[0].get_text_contents()
obj = sim_objects[name]
code = code_formatter()
@@ -632,7 +632,7 @@ def createSimObjectCxxConfig(is_header):
def createEnumStrings(target, source, env):
assert len(target) == 1 and len(source) == 2
- name = str(source[0].get_contents())
+ name = source[0].get_text_contents()
use_python = source[1].read()
obj = all_enums[name]
@@ -645,7 +645,7 @@ def createEnumStrings(target, source, env):
def createEnumDecls(target, source, env):
assert len(target) == 1 and len(source) == 1
- name = str(source[0].get_contents())
+ name = source[0].get_text_contents()
obj = all_enums[name]
code = code_formatter()
@@ -653,7 +653,7 @@ def createEnumDecls(target, source, env):
code.write(target[0].abspath)
def createSimObjectPyBindWrapper(target, source, env):
- name = source[0].get_contents()
+ name = source[0].get_text_contents()
obj = sim_objects[name]
code = code_formatter()