util: clean up attrdict and import multiattrdict into m5.util

diff --git a/src/python/m5/util/__init__.py b/src/python/m5/util/__init__.py
index 7a674dd2dd670586604d4dd222fd6d8dd2a2eb1a..e870968412e43165e6b725c763d1529f52fae83a 100644 (file)
--- a/src/python/m5/util/__init__.py
+++ b/src/python/m5/util/__init__.py
@@ -34,7 +34,7 @@ import sys
 import convert
 import jobfile
 
-from attrdict import attrdict, optiondict
+from attrdict import attrdict, multiattrdict, optiondict
 from code_formatter import code_formatter
 from multidict import multidict
 from orderdict import orderdict

diff --git a/src/python/m5/util/attrdict.py b/src/python/m5/util/attrdict.py
index 8f7d596980c0a80873ea7c799e04809d175a7f1f..cb83e9e24dc36034b82682a0c9a75ac933f04c14 100644 (file)
--- a/src/python/m5/util/attrdict.py
+++ b/src/python/m5/util/attrdict.py
@@ -58,6 +58,9 @@ class multiattrdict(attrdict):
         try:
             return super(multiattrdict, self).__getattr__(attr)
         except AttributeError:
+            if attr.startswith('_'):
+                raise
+
             d = multiattrdict()
             setattr(self, attr, d)
             return d