summaryrefslogtreecommitdiff
path: root/src/python/m5
diff options
context:
space:
mode:
authorAndreas Sandberg <andreas.sandberg@arm.com>2019-02-12 09:57:15 +0000
committerAndreas Sandberg <andreas.sandberg@arm.com>2019-02-12 16:44:21 +0000
commitbc42d2fa8bc7fc2bd610011993ac168e8f5f41d3 (patch)
tree27fb9d9889a55c2fe43dd27610fa353bd4eea238 /src/python/m5
parent31dff7faa0a0be22e70376a49748cf4b8f1eb5f9 (diff)
downloadgem5-bc42d2fa8bc7fc2bd610011993ac168e8f5f41d3.tar.xz
python: Replace orderdict with collections.OrderedDict
Python 2.7 and newer has support for ordered dictionaries in the standard library. Remove this custom class. Change-Id: I4b720405aa3c4ce8d5c0b401eefe744a85ac3a3e Signed-off-by: Andreas Sandberg <andreas.sandberg@arm.com> Reviewed-on: https://gem5-review.googlesource.com/c/16362 Reviewed-by: Giacomo Travaglini <giacomo.travaglini@arm.com> Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Diffstat (limited to 'src/python/m5')
-rw-r--r--src/python/m5/util/__init__.py1
-rw-r--r--src/python/m5/util/orderdict.py73
2 files changed, 0 insertions, 74 deletions
diff --git a/src/python/m5/util/__init__.py b/src/python/m5/util/__init__.py
index 02dece69b..341e54fdb 100644
--- a/src/python/m5/util/__init__.py
+++ b/src/python/m5/util/__init__.py
@@ -51,7 +51,6 @@ import jobfile
from attrdict import attrdict, multiattrdict, optiondict
from code_formatter import code_formatter
from multidict import multidict
-from orderdict import orderdict
from smartdict import SmartDict
from sorteddict import SortedDict
diff --git a/src/python/m5/util/orderdict.py b/src/python/m5/util/orderdict.py
deleted file mode 100644
index 1ffbca87a..000000000
--- a/src/python/m5/util/orderdict.py
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright (c) 2005 The Regents of The University of Michigan
-# 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
-
-__all__ = [ 'orderdict' ]
-
-from UserDict import DictMixin
-
-class orderdict(dict, DictMixin):
- def __init__(self, *args, **kwargs):
- if len(args) > 1:
- raise TypeError("expected at most one argument, got %d" % \
- len(args))
- self._keys = []
- self.update(*args, **kwargs)
-
- def __setitem__(self, key, item):
- if key not in self:
- self._keys.append(key)
- super(orderdict, self).__setitem__(key, item)
-
- def __delitem__(self, key):
- super(orderdict, self).__delitem__(key)
- self._keys.remove(key)
-
- def clear(self):
- super(orderdict, self).clear()
- self._keys = []
-
- def iterkeys(self):
- for key in self._keys:
- yield key
-
- def itervalues(self):
- for key in self._keys:
- yield self[key]
-
- def iteritems(self):
- for key in self._keys:
- yield key, self[key]
-
- def keys(self):
- return self._keys[:]
-
- def values(self):
- return [ self[key] for key in self._keys ]
-
- def items(self):
- return [ (self[key],key) for key in self._keys ]