From ef71a987c1987f7543d3bf76ed9e5ce62f4d1daa Mon Sep 17 00:00:00 2001 From: Andreas Sandberg Date: Fri, 25 Jan 2019 14:26:21 +0000 Subject: python: Don't assume SimObjects live in the global namespace The importer in Python 3 doesn't like the way we import SimObjects from the global namespace. Convert the existing SimObject declarations to import from m5.objects. As a side-effect, this makes these files consistent with configuration files. Change-Id: I11153502b430822130722839e1fa767b82a027aa Signed-off-by: Andreas Sandberg Reviewed-on: https://gem5-review.googlesource.com/c/15981 Reviewed-by: Jason Lowe-Power Reviewed-by: Giacomo Travaglini --- src/mem/ExternalMaster.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/mem/ExternalMaster.py') diff --git a/src/mem/ExternalMaster.py b/src/mem/ExternalMaster.py index 44b49971a..883e27727 100644 --- a/src/mem/ExternalMaster.py +++ b/src/mem/ExternalMaster.py @@ -39,7 +39,7 @@ from m5.params import * from m5.proxy import * -from MemObject import MemObject +from m5.objects.MemObject import MemObject class ExternalMaster(MemObject): type = 'ExternalMaster' -- cgit v1.2.3