summaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
authorSteve Reinhardt <stever@eecs.umich.edu>2005-03-19 08:47:19 -0500
committerSteve Reinhardt <stever@eecs.umich.edu>2005-03-19 08:47:19 -0500
commitfc04f8015f24e800061b14767d6829a30dd5c9a5 (patch)
tree77f1300b8336641eebb87f801626f30c6ca3ee84 /python
parent634b38fc41307ba273351878f6582bdfd00173c9 (diff)
parentc929ee2c1001b25b2c12ca0256b73ea429ac6052 (diff)
downloadgem5-fc04f8015f24e800061b14767d6829a30dd5c9a5.tar.xz
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/z/stever/bk/m5-head --HG-- extra : convert_revision : a1cca61433e2cc9fd99d1a2361d32ea5c91b09c7
Diffstat (limited to 'python')
-rw-r--r--python/m5/__init__.py8
-rw-r--r--python/m5/config.py5
2 files changed, 8 insertions, 5 deletions
diff --git a/python/m5/__init__.py b/python/m5/__init__.py
index 16f48dba3..27bd91749 100644
--- a/python/m5/__init__.py
+++ b/python/m5/__init__.py
@@ -1,14 +1,14 @@
import sys, os
-# the mpy import code is added to the global import meta_path as a
-# side effect of this import
-from mpy_importer import AddToPath, LoadMpyFile
-
# define this here so we can use it right away if necessary
def panic(string):
print >>sys.stderr, 'panic:', string
sys.exit(1)
+# the mpy import code is added to the global import meta_path as a
+# side effect of this import
+from mpy_importer import AddToPath, LoadMpyFile
+
# find the m5 compile options: must be specified as a dict in
# __main__.m5_build_env.
import __main__
diff --git a/python/m5/config.py b/python/m5/config.py
index 64ec99490..42aee885b 100644
--- a/python/m5/config.py
+++ b/python/m5/config.py
@@ -151,8 +151,11 @@ class Proxy(object):
self._multiplier = None
def __getattr__(self, attr):
+ # python uses __bases__ internally for inheritance
if attr == '__bases__':
return super(Proxy, self).__getattr__(self, attr)
+ if (self._path == None):
+ panic("Can't add attributes to 'any' proxy")
self._path.append((attr,None))
return self
@@ -347,7 +350,7 @@ class MetaConfigNode(type):
elif isNullPointer(val):
cls._values[key] = val
- # process param types from _init_dict, as these may be needed
+ # process param types from _init_dict first, as these may be needed
# by param descriptions also in _init_dict
for key,val in cls._init_dict.items():
if isinstance(val, type) and issubclass(val, ParamType):