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

Merge heads.

Browse source
This commit is contained in:
Ezio Melotti 2011-10-28 12:32:53 +03:00
commit 0b85cd0680
2 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Doc/library/argparse.rst
View file

@ -703,7 +703,7 @@ how the command-line arguments should be handled. The supported actions are:
>>> parser.add_argument('--str', dest='types', action='append_const', const=str) >>> parser.add_argument('--str', dest='types', action='append_const', const=str)
>>> parser.add_argument('--int', dest='types', action='append_const', const=int) >>> parser.add_argument('--int', dest='types', action='append_const', const=int)
>>> parser.parse_args('--str --int'.split()) >>> 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 * ``'version'`` - This expects a ``version=`` keyword argument in the
:meth:`~ArgumentParser.add_argument` call, and prints version information :meth:`~ArgumentParser.add_argument` call, and prints version information

8
Doc/library/stdtypes.rst
View file

@ -2785,8 +2785,6 @@ types, where they are relevant. Some of these are not reported by the
The name of the class or type. The name of the class or type.
The following attributes are only supported by :term:`new-style class`\ es.
.. attribute:: class.__mro__ .. attribute:: class.__mro__
This attribute is a tuple of classes that are considered when looking for This attribute is a tuple of classes that are considered when looking for
@ -2802,12 +2800,12 @@ The following attributes are only supported by :term:`new-style class`\ es.
.. method:: class.__subclasses__ .. method:: class.__subclasses__
Each new-style class keeps a list of weak references to its immediate Each class keeps a list of weak references to its immediate subclasses. This
subclasses. This method returns a list of all those references still alive. method returns a list of all those references still alive.
Example:: Example::
>>> int.__subclasses__() >>> int.__subclasses__()
[<type 'bool'>] [<class 'bool'>]
.. rubric:: Footnotes .. rubric:: Footnotes