summaryrefslogtreecommitdiff
path: root/Lib/collections
diff options
context:
space:
mode:
authorRaymond Hettinger <python@rcn.com>2015-08-30 09:15:36 -0700
committerRaymond Hettinger <python@rcn.com>2015-08-30 09:15:36 -0700
commit9157545c1179045dda9d3c23961a971d838afa3a (patch)
tree5f90ae18edb1e9d1ae563e1c57fb598a26fe4f6b /Lib/collections
parentce50802679bd4742f604c92775cd4f6b448769ea (diff)
parent7a3602e7cf1c0f54d52c563afca50c2e09e7bbf9 (diff)
downloadcpython-git-9157545c1179045dda9d3c23961a971d838afa3a.tar.gz
merge
Diffstat (limited to 'Lib/collections')
-rw-r--r--Lib/collections/__init__.py11
1 files changed, 1 insertions, 10 deletions
diff --git a/Lib/collections/__init__.py b/Lib/collections/__init__.py
index 80dc4f6d4e..26e5d34716 100644
--- a/Lib/collections/__init__.py
+++ b/Lib/collections/__init__.py
@@ -320,23 +320,14 @@ class {typename}(tuple):
'Return a nicely formatted representation string'
return self.__class__.__name__ + '({repr_fmt})' % self
- @property
- def __dict__(self):
- 'A new OrderedDict mapping field names to their values'
- return OrderedDict(zip(self._fields, self))
-
def _asdict(self):
'Return a new OrderedDict which maps field names to their values.'
- return self.__dict__
+ return OrderedDict(zip(self._fields, self))
def __getnewargs__(self):
'Return self as a plain tuple. Used by copy and pickle.'
return tuple(self)
- def __getstate__(self):
- 'Exclude the OrderedDict from pickling'
- return None
-
{field_defs}
"""