From: Raymond Hettinger <python@rcn.com>
Date: Tue, 16 Aug 2016 17:59:21 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.6.0b1~702
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a5f1fbd493006eaa87fdd32b20333ca68c97e29f;p=python

merge
---

a5f1fbd493006eaa87fdd32b20333ca68c97e29f
diff --cc Doc/library/collections.rst
index a6c9be6333,a147287255..778bd540ac
--- a/Doc/library/collections.rst
+++ b/Doc/library/collections.rst
@@@ -793,17 -793,8 +793,12 @@@ they add the ability to access fields b
      Named tuple instances do not have per-instance dictionaries, so they are
      lightweight and require no more memory than regular tuples.
  
-     For simple uses, where the only requirement is to be able to refer to a set
-     of values by name using attribute-style access, the
-     :class:`types.SimpleNamespace` type can be a suitable alternative to using
-     a namedtuple.
- 
      .. versionchanged:: 3.1
 -        Added support for *rename*.
 +       Added support for *rename*.
 +
 +    .. versionchanged:: 3.6
 +       The *verbose* and *rename* parameters became
 +       :ref:`keyword-only arguments <keyword-only_parameter>`.
  
  
  .. doctest::