Kaydet (Commit) 08c70cf5 authored tarafından Raymond Hettinger's avatar Raymond Hettinger

Make the underlying data structure more private.

üst b0d56afc
...@@ -22,40 +22,44 @@ class OrderedDict(dict, MutableMapping): ...@@ -22,40 +22,44 @@ class OrderedDict(dict, MutableMapping):
def __init__(self, *args, **kwds): def __init__(self, *args, **kwds):
if len(args) > 1: if len(args) > 1:
raise TypeError('expected at most 1 arguments, got %d' % len(args)) raise TypeError('expected at most 1 arguments, got %d' % len(args))
if not hasattr(self, '_keys'): try:
self._keys = [] self.__keys
except AttributeError:
# Note the underlying data structure for this class is likely to
# change in the future. Do not rely on it or access it directly.
self.__keys = []
self.update(*args, **kwds) self.update(*args, **kwds)
def clear(self): def clear(self):
del self._keys[:] del self.__keys[:]
dict.clear(self) dict.clear(self)
def __setitem__(self, key, value): def __setitem__(self, key, value):
if key not in self: if key not in self:
self._keys.append(key) self.__keys.append(key)
dict.__setitem__(self, key, value) dict.__setitem__(self, key, value)
def __delitem__(self, key): def __delitem__(self, key):
dict.__delitem__(self, key) dict.__delitem__(self, key)
self._keys.remove(key) self.__keys.remove(key)
def __iter__(self): def __iter__(self):
return iter(self._keys) return iter(self.__keys)
def __reversed__(self): def __reversed__(self):
return reversed(self._keys) return reversed(self.__keys)
def popitem(self): def popitem(self):
if not self: if not self:
raise KeyError('dictionary is empty') raise KeyError('dictionary is empty')
key = self._keys.pop() key = self.__keys.pop()
value = dict.pop(self, key) value = dict.pop(self, key)
return key, value return key, value
def __reduce__(self): def __reduce__(self):
items = [[k, self[k]] for k in self] items = [[k, self[k]] for k in self]
inst_dict = vars(self).copy() inst_dict = vars(self).copy()
inst_dict.pop('_keys', None) inst_dict.pop('__keys', None)
return (self.__class__, (items,), inst_dict) return (self.__class__, (items,), inst_dict)
setdefault = MutableMapping.setdefault setdefault = MutableMapping.setdefault
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment