From: Andreas Sandberg <andreas.sandberg@arm.com>
Date: Sat, 26 Jan 2019 09:07:54 +0000 (+0000)
Subject: python: Remove uses of tuple unpacking in function params
X-Git-Tag: v19.0.0.0~1136
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e67a3d19b7fabd86d220534302a65ad3b62f751e;p=gem5.git

python: Remove uses of tuple unpacking in function params

Python 3 doesn't support tuple unpacking in function parameters and
lambdas.

Change-Id: I36c72962e33a9ad37145089687834becccc76adb
Signed-off-by: Andreas Sandberg <andreas.sandberg@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/15991
Reviewed-by: Gabe Black <gabeblack@google.com>
---

diff --git a/src/python/m5/SimObject.py b/src/python/m5/SimObject.py
index f553fd664..20bb5faec 100644
--- a/src/python/m5/SimObject.py
+++ b/src/python/m5/SimObject.py
@@ -681,7 +681,7 @@ class MetaSimObject(type):
         # the object itself, not including inherited params (which
         # will also be inherited from the base class's param struct
         # here). Sort the params based on their key
-        params = map(lambda (k, v): v, sorted(cls._params.local.items()))
+        params = map(lambda k_v: k_v[1], sorted(cls._params.local.items()))
         ports = cls._ports.local
 
         code('''#include "pybind11/pybind11.h"
@@ -777,7 +777,7 @@ module_init(py::module &m_internal)
         # the object itself, not including inherited params (which
         # will also be inherited from the base class's param struct
         # here). Sort the params based on their key
-        params = map(lambda (k, v): v, sorted(cls._params.local.items()))
+        params = map(lambda k_v: k_v[1], sorted(cls._params.local.items()))
         ports = cls._ports.local
         try:
             ptypes = [p.ptype for p in params]