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/util/multidict.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/python/m5/util/multidict.py') diff --git a/src/python/m5/util/multidict.py b/src/python/m5/util/multidict.py index d22b1cbbc..28090a251 100644 --- a/src/python/m5/util/multidict.py +++ b/src/python/m5/util/multidict.py @@ -48,11 +48,11 @@ class multidict(object): def __delitem__(self, key): try: del self.local[key] - except KeyError, e: + except KeyError as e: if key in self.parent: self.deleted[key] = True else: - raise KeyError, e + raise KeyError(e) def __setitem__(self, key, value): self.deleted.pop(key, False) @@ -61,11 +61,11 @@ class multidict(object): def __getitem__(self, key): try: return self.local[key] - except KeyError, e: + except KeyError as e: if not self.deleted.get(key, False) and key in self.parent: return self.parent[key] else: - raise KeyError, e + raise KeyError(e) def __len__(self): return len(self.local) + len(self.parent) @@ -106,7 +106,7 @@ class multidict(object): def get(self, key, default=None): try: return self[key] - except KeyError, e: + except KeyError as e: return default def setdefault(self, key, default): -- cgit v1.2.3