[gem5-dev] Change in gem5/gem5[master]: python: Enforce absolute imports for Python 3 compatibility
Andreas Sandberg has submitted this change and it was merged. ( https://gem5-review.googlesource.com/c/public/gem5/+/15983 ) Change subject: python: Enforce absolute imports for Python 3 compatibility .. python: Enforce absolute imports for Python 3 compatibility Change-Id: Ia88d7fd472f7aed9b97df81468211384981bf6c6 Signed-off-by: Andreas Sandberg Reviewed-on: https://gem5-review.googlesource.com/c/15983 Reviewed-by: Gabe Black Maintainer: Gabe Black --- M src/arch/generic/BaseTLB.py M src/python/importer.py M src/python/m5/SimObject.py M src/python/m5/__init__.py M src/python/m5/core.py M src/python/m5/ext/__init__.py M src/python/m5/ext/pyfdt/pyfdt.py M src/python/m5/internal/params.py M src/python/m5/main.py M src/python/m5/objects/__init__.py M src/python/m5/options.py M src/python/m5/params.py M src/python/m5/proxy.py M src/python/m5/simulate.py M src/python/m5/trace.py M src/python/m5/util/__init__.py M src/python/m5/util/code_formatter.py M src/python/m5/util/dot_writer.py M src/python/m5/util/jobfile.py M src/python/m5/util/pybind.py M src/python/m5/util/smartdict.py M src/python/m5/util/sorteddict.py M src/python/m5/util/terminal.py 23 files changed, 84 insertions(+), 42 deletions(-) Approvals: Gabe Black: Looks good to me, approved; Looks good to me, approved diff --git a/src/arch/generic/BaseTLB.py b/src/arch/generic/BaseTLB.py index b98b993..688117a 100644 --- a/src/arch/generic/BaseTLB.py +++ b/src/arch/generic/BaseTLB.py @@ -29,7 +29,7 @@ # Ivan Pizarro from m5.params import * -from MemObject import MemObject +from m5.objects.MemObject import MemObject class BaseTLB(MemObject): type = 'BaseTLB' diff --git a/src/python/importer.py b/src/python/importer.py index 224ab3b..20d168e 100644 --- a/src/python/importer.py +++ b/src/python/importer.py @@ -26,6 +26,9 @@ # # Authors: Nathan Binkert +from __future__ import print_function +from __future__ import absolute_import + # Simple importer that allows python to import data from a dict of # code objects. The keys are the module path, and the items are the # filename and bytecode of the file. diff --git a/src/python/m5/SimObject.py b/src/python/m5/SimObject.py index 11330b4..5a86912 100644 --- a/src/python/m5/SimObject.py +++ b/src/python/m5/SimObject.py @@ -44,6 +44,7 @@ # Andreas Sandberg from __future__ import print_function +from __future__ import absolute_import import sys from types import FunctionType, MethodType, ModuleType diff --git a/src/python/m5/__init__.py b/src/python/m5/__init__.py index 2730ea1..d97727c 100644 --- a/src/python/m5/__init__.py +++ b/src/python/m5/__init__.py @@ -26,6 +26,9 @@ # # Authors: Nathan Binkert +from __future__ import print_function +from __future__ import absolute_import + # Import useful subpackages of M5, but *only* when run as an m5 # script. This is mostly to keep backward compatibility with existing # scripts while allowing new SCons code to operate properly. @@ -42,14 +45,14 @@ in_gem5 = False if in_gem5: -import SimObject -import core -import objects -import params -import stats -import util +from . import SimObject +from . import core +from . import objects +from . import params +from . import stats +from . import util -from event import * -from main import main -from simulate import * +from .event import * +from .main import main +from .simulate import * diff --git a/src/python/m5/core.py b/src/python/m5/core.py index ab0ea57..4c94353 100644 --- a/src/python/m5/core.py +++ b/src/python/m5/core.py @@ -26,4 +26,7 @@ # # Authors: Nathan Binkert +from __future__ import print_function +from __future__ import absolute_import + from _m5.core import setOutputDir diff --git a/src/python/m5/ext/__init__.py b/src/python/m5/ext/__init__.py index a5bc8ef..f566a34 100644 --- a/src/python/m5/ext/__init__.py +++ b/src/python/m5/ext/__init__.py @@ -36,3 +36,6 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # # Authors: Glenn Bergmans + +from __future__ import print_function +from __future__ import absolute_import diff --git a/src/python/m5/ext/pyfdt/pyfdt.py b/src/python/m5/ext/pyfdt/pyfdt.py index 3b3238e..3c78b03 100644 --- a/src/python/m5/ext/pyfdt/pyfdt.py +++ b/src/python/m5/ext/pyfdt/pyfdt.py @@ -19,6 +19,9 @@ @author: Neil 'superna' Armstrong """ +from __future__ import print_function +from __future__ import absolute_import + import string import os import json diff --git a/src/python/m5/internal/params.py b/src/python/m5/internal/params.py index 400e780..d06851a 100644 --- a/src/python/m5/internal/params.py +++ b/src/python/m5/internal/params.py @@ -38,6 +38,9 @@ # # Authors: Nathan Binkert +from __future__ import print_function +from __future__ import absolute_import + import inspect import _m5 diff --git a/src/python/m5/main.py b/src/python/m5/main.p
[gem5-dev] Change in gem5/gem5[master]: python: Enforce absolute imports for Python 3 compatibility
Hello Gabe Black, Jason Lowe-Power, Giacomo Travaglini, I'd like you to reexamine a change. Please visit https://gem5-review.googlesource.com/c/public/gem5/+/15983 to look at the new patch set (#7). Change subject: python: Enforce absolute imports for Python 3 compatibility .. python: Enforce absolute imports for Python 3 compatibility Change-Id: Ia88d7fd472f7aed9b97df81468211384981bf6c6 Signed-off-by: Andreas Sandberg --- M src/arch/generic/BaseTLB.py M src/python/importer.py M src/python/m5/SimObject.py M src/python/m5/__init__.py M src/python/m5/core.py M src/python/m5/ext/__init__.py M src/python/m5/ext/pyfdt/pyfdt.py M src/python/m5/internal/params.py M src/python/m5/main.py M src/python/m5/objects/__init__.py M src/python/m5/options.py M src/python/m5/params.py M src/python/m5/proxy.py M src/python/m5/simulate.py M src/python/m5/trace.py M src/python/m5/util/__init__.py M src/python/m5/util/code_formatter.py M src/python/m5/util/dot_writer.py M src/python/m5/util/jobfile.py M src/python/m5/util/pybind.py M src/python/m5/util/smartdict.py M src/python/m5/util/sorteddict.py M src/python/m5/util/terminal.py 23 files changed, 84 insertions(+), 42 deletions(-) -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/15983 To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings Gerrit-Project: public/gem5 Gerrit-Branch: master Gerrit-Change-Id: Ia88d7fd472f7aed9b97df81468211384981bf6c6 Gerrit-Change-Number: 15983 Gerrit-PatchSet: 7 Gerrit-Owner: Andreas Sandberg Gerrit-Reviewer: Andreas Sandberg Gerrit-Reviewer: Gabe Black Gerrit-Reviewer: Giacomo Travaglini Gerrit-Reviewer: Jason Lowe-Power Gerrit-MessageType: newpatchset ___ gem5-dev mailing list gem5-dev@gem5.org http://m5sim.org/mailman/listinfo/gem5-dev
[gem5-dev] Change in gem5/gem5[master]: python: Enforce absolute imports for Python 3 compatibility
Hello Gabe Black, Jason Lowe-Power, Giacomo Travaglini, I'd like you to reexamine a change. Please visit https://gem5-review.googlesource.com/c/public/gem5/+/15983 to look at the new patch set (#4). Change subject: python: Enforce absolute imports for Python 3 compatibility .. python: Enforce absolute imports for Python 3 compatibility Change-Id: Ia88d7fd472f7aed9b97df81468211384981bf6c6 Signed-off-by: Andreas Sandberg --- M src/python/importer.py M src/python/m5/SimObject.py M src/python/m5/__init__.py M src/python/m5/core.py M src/python/m5/ext/__init__.py M src/python/m5/ext/pyfdt/pyfdt.py M src/python/m5/internal/params.py M src/python/m5/main.py M src/python/m5/objects/__init__.py M src/python/m5/options.py M src/python/m5/params.py M src/python/m5/proxy.py M src/python/m5/simulate.py M src/python/m5/trace.py M src/python/m5/util/__init__.py M src/python/m5/util/code_formatter.py M src/python/m5/util/dot_writer.py M src/python/m5/util/jobfile.py M src/python/m5/util/pybind.py M src/python/m5/util/smartdict.py M src/python/m5/util/sorteddict.py M src/python/m5/util/terminal.py 22 files changed, 83 insertions(+), 41 deletions(-) -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/15983 To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings Gerrit-Project: public/gem5 Gerrit-Branch: master Gerrit-Change-Id: Ia88d7fd472f7aed9b97df81468211384981bf6c6 Gerrit-Change-Number: 15983 Gerrit-PatchSet: 4 Gerrit-Owner: Andreas Sandberg Gerrit-Reviewer: Andreas Sandberg Gerrit-Reviewer: Gabe Black Gerrit-Reviewer: Giacomo Travaglini Gerrit-Reviewer: Jason Lowe-Power Gerrit-MessageType: newpatchset ___ gem5-dev mailing list gem5-dev@gem5.org http://m5sim.org/mailman/listinfo/gem5-dev
[gem5-dev] Change in gem5/gem5[master]: python: Enforce absolute imports for Python 3 compatibility
Andreas Sandberg has uploaded a new patch set (#2). ( https://gem5-review.googlesource.com/c/public/gem5/+/15983 ) Change subject: python: Enforce absolute imports for Python 3 compatibility .. python: Enforce absolute imports for Python 3 compatibility Change-Id: Ia88d7fd472f7aed9b97df81468211384981bf6c6 Signed-off-by: Andreas Sandberg --- M src/python/importer.py M src/python/m5/SimObject.py M src/python/m5/__init__.py M src/python/m5/core.py M src/python/m5/ext/__init__.py M src/python/m5/ext/pyfdt/pyfdt.py M src/python/m5/internal/params.py M src/python/m5/main.py M src/python/m5/objects/__init__.py M src/python/m5/options.py M src/python/m5/params.py M src/python/m5/proxy.py M src/python/m5/simulate.py M src/python/m5/trace.py M src/python/m5/util/__init__.py M src/python/m5/util/code_formatter.py M src/python/m5/util/dot_writer.py M src/python/m5/util/jobfile.py M src/python/m5/util/orderdict.py M src/python/m5/util/pybind.py M src/python/m5/util/smartdict.py M src/python/m5/util/sorteddict.py M src/python/m5/util/terminal.py 23 files changed, 87 insertions(+), 42 deletions(-) -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/15983 To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings Gerrit-Project: public/gem5 Gerrit-Branch: master Gerrit-Change-Id: Ia88d7fd472f7aed9b97df81468211384981bf6c6 Gerrit-Change-Number: 15983 Gerrit-PatchSet: 2 Gerrit-Owner: Andreas Sandberg Gerrit-MessageType: newpatchset ___ gem5-dev mailing list gem5-dev@gem5.org http://m5sim.org/mailman/listinfo/gem5-dev
[gem5-dev] Change in gem5/gem5[master]: python: Enforce absolute imports for Python 3 compatibility
Andreas Sandberg has uploaded this change for review. ( https://gem5-review.googlesource.com/c/public/gem5/+/15983 Change subject: python: Enforce absolute imports for Python 3 compatibility .. python: Enforce absolute imports for Python 3 compatibility Change-Id: Ia88d7fd472f7aed9b97df81468211384981bf6c6 Signed-off-by: Andreas Sandberg --- M src/python/importer.py M src/python/m5/SimObject.py M src/python/m5/__init__.py M src/python/m5/core.py M src/python/m5/ext/__init__.py M src/python/m5/ext/pyfdt/pyfdt.py M src/python/m5/internal/params.py M src/python/m5/main.py M src/python/m5/objects/__init__.py M src/python/m5/options.py M src/python/m5/params.py M src/python/m5/proxy.py M src/python/m5/simulate.py M src/python/m5/trace.py M src/python/m5/util/__init__.py M src/python/m5/util/code_formatter.py M src/python/m5/util/dot_writer.py M src/python/m5/util/jobfile.py M src/python/m5/util/orderdict.py M src/python/m5/util/pybind.py M src/python/m5/util/smartdict.py M src/python/m5/util/sorteddict.py M src/python/m5/util/terminal.py 23 files changed, 86 insertions(+), 42 deletions(-) diff --git a/src/python/importer.py b/src/python/importer.py index 60b9b35..a5135d3 100644 --- a/src/python/importer.py +++ b/src/python/importer.py @@ -26,6 +26,9 @@ # # Authors: Nathan Binkert +from __future__ import print_function +from __future__ import absolute_import + # Simple importer that allows python to import data from a dict of # code objects. The keys are the module path, and the items are the # filename and bytecode of the file. diff --git a/src/python/m5/SimObject.py b/src/python/m5/SimObject.py index 03d5d3a..1aa8dbe 100644 --- a/src/python/m5/SimObject.py +++ b/src/python/m5/SimObject.py @@ -44,6 +44,7 @@ # Andreas Sandberg from __future__ import print_function +from __future__ import absolute_import from six import add_metaclass diff --git a/src/python/m5/__init__.py b/src/python/m5/__init__.py index 2730ea1..d97727c 100644 --- a/src/python/m5/__init__.py +++ b/src/python/m5/__init__.py @@ -26,6 +26,9 @@ # # Authors: Nathan Binkert +from __future__ import print_function +from __future__ import absolute_import + # Import useful subpackages of M5, but *only* when run as an m5 # script. This is mostly to keep backward compatibility with existing # scripts while allowing new SCons code to operate properly. @@ -42,14 +45,14 @@ in_gem5 = False if in_gem5: -import SimObject -import core -import objects -import params -import stats -import util +from . import SimObject +from . import core +from . import objects +from . import params +from . import stats +from . import util -from event import * -from main import main -from simulate import * +from .event import * +from .main import main +from .simulate import * diff --git a/src/python/m5/core.py b/src/python/m5/core.py index ab0ea57..4c94353 100644 --- a/src/python/m5/core.py +++ b/src/python/m5/core.py @@ -26,4 +26,7 @@ # # Authors: Nathan Binkert +from __future__ import print_function +from __future__ import absolute_import + from _m5.core import setOutputDir diff --git a/src/python/m5/ext/__init__.py b/src/python/m5/ext/__init__.py index a5bc8ef..f566a34 100644 --- a/src/python/m5/ext/__init__.py +++ b/src/python/m5/ext/__init__.py @@ -36,3 +36,6 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # # Authors: Glenn Bergmans + +from __future__ import print_function +from __future__ import absolute_import diff --git a/src/python/m5/ext/pyfdt/pyfdt.py b/src/python/m5/ext/pyfdt/pyfdt.py index 3b3238e..3c78b03 100644 --- a/src/python/m5/ext/pyfdt/pyfdt.py +++ b/src/python/m5/ext/pyfdt/pyfdt.py @@ -19,6 +19,9 @@ @author: Neil 'superna' Armstrong """ +from __future__ import print_function +from __future__ import absolute_import + import string import os import json diff --git a/src/python/m5/internal/params.py b/src/python/m5/internal/params.py index ef94ad4..bbf86ce 100644 --- a/src/python/m5/internal/params.py +++ b/src/python/m5/internal/params.py @@ -38,6 +38,9 @@ # # Authors: Nathan Binkert +from __future__ import print_function +from __future__ import absolute_import + import inspect import _m5 diff --git a/src/python/m5/main.py b/src/python/m5/main.py index d8c0d92..8884c9e 100644 --- a/src/python/m5/main.py +++ b/src/python/m5/main.py @@ -54,8 +54,8 @@ "gem5 is copyrighted software; use the --copyright option for details." def parse_options(): -import config -from options import OptionParser +from . import config +from .options import OptionParser options = OptionParser(usage=usage, version=version, description=brief_copyright) @@ -194,15 +194,15 @@ def main(*args): import m5 -import core -import debug -import defines -import event -import info -
