From: Steve Reinhardt <steve.reinhardt@amd.com>
Date: Thu, 2 Jun 2011 04:43:13 +0000 (-0700)
Subject: SimObject: allow modules in subclass definitions
X-Git-Tag: stable_2012_02_02~293
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6a1be32a7277c59f13f354bec8ece868043ac0cd;p=gem5.git

SimObject: allow modules in subclass definitions

In particular, this avoids crashing when you do
an import (like "import pdb") inside a SimObject
subclass definition.
---

diff --git a/src/python/m5/SimObject.py b/src/python/m5/SimObject.py
index a143958f0..c18d6900c 100644
--- a/src/python/m5/SimObject.py
+++ b/src/python/m5/SimObject.py
@@ -29,7 +29,7 @@
 #          Nathan Binkert
 
 import sys
-from types import FunctionType, MethodType
+from types import FunctionType, MethodType, ModuleType
 
 try:
     import pydot
@@ -130,7 +130,8 @@ def default_swig_objdecls(cls, code):
 
 def public_value(key, value):
     return key.startswith('_') or \
-               isinstance(value, (FunctionType, MethodType, classmethod, type))
+               isinstance(value, (FunctionType, MethodType, ModuleType,
+                                  classmethod, type))
 
 # The metaclass for SimObject.  This class controls how new classes
 # that derive from SimObject are instantiated, and provides inherited