From fa21127a646b8d2a61fe412728762250ca38ecd2 Mon Sep 17 00:00:00 2001 From: Andreas Sandberg Date: Fri, 25 Jan 2019 11:32:25 +0000 Subject: python: Make exception handling Python 3 safe Change-Id: I9c2cdfad20deb1ddfa224320cf93f2105d126652 Reviewed-on: https://gem5-review.googlesource.com/c/15980 Maintainer: Andreas Sandberg Reviewed-by: Giacomo Travaglini --- src/python/m5/simulate.py | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) (limited to 'src/python/m5/simulate.py') diff --git a/src/python/m5/simulate.py b/src/python/m5/simulate.py index 0e1a67e47..03cc253e9 100644 --- a/src/python/m5/simulate.py +++ b/src/python/m5/simulate.py @@ -221,7 +221,7 @@ def memInvalidate(root): def checkpoint(dir): root = objects.Root.getInstance() if not isinstance(root, objects.Root): - raise TypeError, "Checkpoint must be called on a root object." + raise TypeError("Checkpoint must be called on a root object.") drain() memWriteback(root) @@ -230,8 +230,8 @@ def checkpoint(dir): def _changeMemoryMode(system, mode): if not isinstance(system, (objects.Root, objects.System)): - raise TypeError, "Parameter of type '%s'. Must be type %s or %s." % \ - (type(system), objects.Root, objects.System) + raise TypeError("Parameter of type '%s'. Must be type %s or %s." % \ + (type(system), objects.Root, objects.System)) if system.getMemoryMode() != mode: system.setMemoryMode(mode) else: @@ -253,10 +253,10 @@ def switchCpus(system, cpuList, verbose=True): print("switching cpus") if not isinstance(cpuList, list): - raise RuntimeError, "Must pass a list to this function" + raise RuntimeError("Must pass a list to this function") for item in cpuList: if not isinstance(item, tuple) or len(item) != 2: - raise RuntimeError, "List must have tuples of (oldCPU,newCPU)" + raise RuntimeError("List must have tuples of (oldCPU,newCPU)") old_cpus = [old_cpu for old_cpu, new_cpu in cpuList] new_cpus = [new_cpu for old_cpu, new_cpu in cpuList] @@ -264,33 +264,31 @@ def switchCpus(system, cpuList, verbose=True): memory_mode_name = new_cpus[0].memory_mode() for old_cpu, new_cpu in cpuList: if not isinstance(old_cpu, objects.BaseCPU): - raise TypeError, "%s is not of type BaseCPU" % old_cpu + raise TypeError("%s is not of type BaseCPU" % old_cpu) if not isinstance(new_cpu, objects.BaseCPU): - raise TypeError, "%s is not of type BaseCPU" % new_cpu + raise TypeError("%s is not of type BaseCPU" % new_cpu) if new_cpu in old_cpu_set: - raise RuntimeError, \ - "New CPU (%s) is in the list of old CPUs." % (old_cpu,) + raise RuntimeError( + "New CPU (%s) is in the list of old CPUs." % (old_cpu,)) if not new_cpu.switchedOut(): - raise RuntimeError, \ - "New CPU (%s) is already active." % (new_cpu,) + raise RuntimeError("New CPU (%s) is already active." % (new_cpu,)) if not new_cpu.support_take_over(): - raise RuntimeError, \ - "New CPU (%s) does not support CPU handover." % (old_cpu,) + raise RuntimeError( + "New CPU (%s) does not support CPU handover." % (old_cpu,)) if new_cpu.memory_mode() != memory_mode_name: - raise RuntimeError, \ + raise RuntimeError( "%s and %s require different memory modes." % (new_cpu, - new_cpus[0]) + new_cpus[0])) if old_cpu.switchedOut(): - raise RuntimeError, \ - "Old CPU (%s) is inactive." % (new_cpu,) + raise RuntimeError("Old CPU (%s) is inactive." % (new_cpu,)) if not old_cpu.support_take_over(): - raise RuntimeError, \ - "Old CPU (%s) does not support CPU handover." % (old_cpu,) + raise RuntimeError( + "Old CPU (%s) does not support CPU handover." % (old_cpu,)) try: memory_mode = _memory_modes[memory_mode_name] except KeyError: - raise RuntimeError, "Invalid memory mode (%s)" % memory_mode_name + raise RuntimeError("Invalid memory mode (%s)" % memory_mode_name) drain() @@ -343,13 +341,13 @@ def fork(simout="%(parent)s.f%(fork_seq)i"): global fork_count if not _m5.core.listenersDisabled(): - raise RuntimeError, "Can not fork a simulator with listeners enabled" + raise RuntimeError("Can not fork a simulator with listeners enabled") drain() try: pid = os.fork() - except OSError, e: + except OSError as e: raise e if pid == 0: -- cgit v1.2.3