mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Make the underlying data structure more private.

Browse source
This commit is contained in:
Raymond Hettinger 2009-03-03 20:53:51 +00:00
parent f17f81d9c8
commit 9353ea2b85
1 changed files with 19 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Lib/collections.py
View file

@ -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
@ -63,22 +67,22 @@ class OrderedDict(dict, MutableMapping):
pop = MutableMapping.pop pop = MutableMapping.pop
def keys(self): def keys(self):
return self._keys[:] return self.__keys[:]
def values(self): def values(self):
return map(self.__getitem__, self._keys) return map(self.__getitem__, self.__keys)
def items(self): def items(self):
return zip(self._keys, self.values()) return zip(self.__keys, self.values())
def iterkeys(self): def iterkeys(self):
return iter(self._keys) return iter(self.__keys)
def itervalues(self): def itervalues(self):
return _imap(self.__getitem__, self._keys) return _imap(self.__getitem__, self.__keys)
def iteritems(self): def iteritems(self):
return _izip(self._keys, _imap(self.__getitem__, self._keys)) return _izip(self.__keys, _imap(self.__getitem__, self.__keys))
def __repr__(self): def __repr__(self):
if not self: if not self: