From: Andreas Hansson <andreas.hansson@arm.com>
Date: Wed, 18 Sep 2013 12:46:31 +0000 (-0400)
Subject: swig: Fix issue with circular import in 2.0.9/2.0.10
X-Git-Tag: stable_2014_02_15~127
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fe5212f9328c10939bbd062c7c57b4c299376803;p=gem5.git

swig: Fix issue with circular import in 2.0.9/2.0.10

This patch fixes an issue which prevented gem5 from running when built
using swig 2.0.9 and 2.0.10. The generated event.py tried to import
m5.internal which in turn relied on importing event. This patch seems
to fix the problem, and so far has not caused any other issues.
---

diff --git a/src/python/m5/__init__.py b/src/python/m5/__init__.py
index dc6c5a923..9df3f4bfe 100644
--- a/src/python/m5/__init__.py
+++ b/src/python/m5/__init__.py
@@ -32,7 +32,7 @@
 
 try:
     # Try to import something that's generated by swig
-    import internal
+    import internal.core
 
     # Try to grab something from it in case demandimport is being used
     internal.core.curTick
diff --git a/src/python/m5/internal/__init__.py b/src/python/m5/internal/__init__.py
index 30090549a..b795f201f 100644
--- a/src/python/m5/internal/__init__.py
+++ b/src/python/m5/internal/__init__.py
@@ -25,10 +25,3 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 # Authors: Nathan Binkert
-
-import core
-import debug
-import event
-import stats
-import trace
-from drain import DrainManager, Drainable