diff options
| -rw-r--r-- | src/python/SConscript | 1 | ||||
| -rw-r--r-- | src/python/m5/internal/enums.py | 36 | ||||
| -rw-r--r-- | src/python/m5/internal/params.py | 3 |
3 files changed, 2 insertions, 38 deletions
diff --git a/src/python/SConscript b/src/python/SConscript index 8109e945d..9ac7a5b44 100644 --- a/src/python/SConscript +++ b/src/python/SConscript @@ -69,5 +69,4 @@ SwigSource('m5.internal', 'swig/range.i') SwigSource('m5.internal', 'swig/stats.i') SwigSource('m5.internal', 'swig/trace.i') PySource('m5.internal', 'm5/internal/__init__.py') -PySource('m5.internal', 'm5/internal/enums.py') PySource('m5.internal', 'm5/internal/params.py') diff --git a/src/python/m5/internal/enums.py b/src/python/m5/internal/enums.py deleted file mode 100644 index d042a445f..000000000 --- a/src/python/m5/internal/enums.py +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright (c) 2010 The Hewlett-Packard Development Company -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer; -# redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution; -# neither the name of the copyright holders nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# Authors: Nathan Binkert - -try: - modules = __loader__.modules -except NameError: - modules = { } - -for module in modules.iterkeys(): - if module.startswith('m5.internal.enum_'): - exec "from %s import *" % module diff --git a/src/python/m5/internal/params.py b/src/python/m5/internal/params.py index 454229bc3..20e62b2f7 100644 --- a/src/python/m5/internal/params.py +++ b/src/python/m5/internal/params.py @@ -32,5 +32,6 @@ except NameError: modules = { } for module in modules.iterkeys(): - if module.startswith('m5.internal.param_'): + if module.startswith('m5.internal.param_') or \ + module.startswith('m5.internal.enum_'): exec "from %s import *" % module |