derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scons: Switch from the print statement to the print function.

Browse Source 
Starting with version 3, scons imposes using the print function instead
of the print statement in code it processes. To get things building
again, this change moves all python code within gem5 to use the
function version. Another change by another author separately made this
same change to the site_tools and site_init.py files.

Change-Id: I2de7dc3b1be756baad6f60574c47c8b7e80ea3b0
Reviewed-on: https://gem5-review.googlesource.com/8761
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Maintainer: Gabe Black <gabeblack@google.com>
This commit is contained in:
Gabe Black
2018-03-05 22:05:47 -08:00
parent 10e5646dbb
commit 0bb50e6745
33 changed files with 386 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/python/m5/params.py
View File

@@ -59,6 +59,8 @@
#
#####################################################################
from __future__ import print_function
import copy
import datetime
import re
@@ -311,7 +313,7 @@ class SimObjectVector(VectorParamValue):
cmd_line_str = "",
access_str = ""):
if hasattr(self, "_paramEnumed"):
print "Cycle detected enumerating params at %s?!" % (cmd_line_str)
print("Cycle detected enumerating params at %s?!" % (cmd_line_str))
else:
x = 0
for vals in self:
@@ -1826,8 +1828,8 @@ class PortRef(object):
try:
realPeer = self.peer.unproxy(self.simobj)
except:
print "Error in unproxying port '%s' of %s" % \
(self.name, self.simobj.path())
print("Error in unproxying port '%s' of %s" %
(self.name, self.simobj.path()))
raise
self.connect(realPeer)
@@ -1856,9 +1858,9 @@ class PortRef(object):
connectPorts(self.simobj.getCCObject(), self.name, self.index,
peer.simobj.getCCObject(), peer.name, peer.index)
except:
print "Error connecting port %s.%s to %s.%s" % \
print("Error connecting port %s.%s to %s.%s" %
(self.simobj.path(), self.name,
peer.simobj.path(), peer.name)
peer.simobj.path(), peer.name))
raise
self.ccConnected = True
peer.ccConnected = True