Merge heads.
diff --git a/Doc/library/argparse.rst b/Doc/library/argparse.rst
index 88270ed..9c7ef52 100644
--- a/Doc/library/argparse.rst
+++ b/Doc/library/argparse.rst
@@ -703,7 +703,7 @@
>>> parser.add_argument('--str', dest='types', action='append_const', const=str)
>>> parser.add_argument('--int', dest='types', action='append_const', const=int)
>>> parser.parse_args('--str --int'.split())
- Namespace(types=[<type 'str'>, <type 'int'>])
+ Namespace(types=[<class 'str'>, <class 'int'>])
* ``'version'`` - This expects a ``version=`` keyword argument in the
:meth:`~ArgumentParser.add_argument` call, and prints version information
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
index 3692b56..942ecba 100644
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -2785,8 +2785,6 @@
The name of the class or type.
-The following attributes are only supported by :term:`new-style class`\ es.
-
.. attribute:: class.__mro__
This attribute is a tuple of classes that are considered when looking for
@@ -2802,12 +2800,12 @@
.. method:: class.__subclasses__
- Each new-style class keeps a list of weak references to its immediate
- subclasses. This method returns a list of all those references still alive.
+ Each class keeps a list of weak references to its immediate subclasses. This
+ method returns a list of all those references still alive.
Example::
>>> int.__subclasses__()
- [<type 'bool'>]
+ [<class 'bool'>]
.. rubric:: Footnotes