diff options
Diffstat (limited to 'src/python/m5/objects')
| -rw-r--r-- | src/python/m5/objects/__init__.py | 4 | ||||
| -rw-r--r-- | src/python/m5/objects/params.py | 29 |
2 files changed, 2 insertions, 31 deletions
diff --git a/src/python/m5/objects/__init__.py b/src/python/m5/objects/__init__.py index 252ac2b17..29402c581 100644 --- a/src/python/m5/objects/__init__.py +++ b/src/python/m5/objects/__init__.py @@ -26,7 +26,7 @@ # # Authors: Nathan Binkert -from m5.objects.params import * +from m5.internal import params from m5.SimObject import * try: @@ -35,5 +35,5 @@ except NameError: modules = { } for module in modules.iterkeys(): - if module.startswith('m5.objects.') and module != 'm5.objects.params': + if module.startswith('m5.objects.'): exec "from %s import *" % module diff --git a/src/python/m5/objects/params.py b/src/python/m5/objects/params.py deleted file mode 100644 index 4bae9fa3b..000000000 --- a/src/python/m5/objects/params.py +++ /dev/null @@ -1,29 +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 - -from m5.internal.params import * |