[Python-checkins] cpython (merge 3.4 -> default): merge

[raymond.hettinger]

http://hg.python.org/cpython/rev/2470f5d4e269
changeset:   89880:2470f5d4e269
parent:      89878:135aa1c4349d
parent:      89879:3cdb5ceb30d1
user:        Raymond Hettinger <python at rcn.com>
date:        Thu Mar 20 06:44:33 2014 -0700
summary:
  merge

files:
  Lib/collections/__init__.py |  4 +---
  1 files changed, 1 insertions(+), 3 deletions(-)


diff --git a/Lib/collections/__init__.py b/Lib/collections/__init__.py
--- a/Lib/collections/__init__.py
+++ b/Lib/collections/__init__.py
@@ -274,9 +274,7 @@
         return OrderedDict(zip(self._fields, self))
 
     def _asdict(self):
-        '''Return a new OrderedDict which maps field names to their values.
-           This method is obsolete.  Use vars(nt) or nt.__dict__ instead.
-        '''
+        'Return a new OrderedDict which maps field names to their values.'
         return self.__dict__
 
     def __getnewargs__(self):

-- 
Repository URL: http://hg.python.org/cpython