[Python-checkins] cpython (merge 3.2 -> default): Merge 3.2
florent.xicluna
python-checkins at python.org
Fri Oct 28 11:23:56 CEST 2011
http://hg.python.org/cpython/rev/8d85dda39663
changeset: 73154:8d85dda39663
parent: 73152:0d5f17872e06
parent: 73153:54abca0ab03b
user: Florent Xicluna <florent.xicluna at gmail.com>
date: Fri Oct 28 11:23:25 2011 +0200
summary:
Merge 3.2
files:
Doc/library/argparse.rst | 2 +-
Doc/library/stdtypes.rst | 8 +++-----
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/Doc/library/argparse.rst b/Doc/library/argparse.rst
--- a/Doc/library/argparse.rst
+++ b/Doc/library/argparse.rst
@@ -722,7 +722,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
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -2808,8 +2808,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
@@ -2825,12 +2823,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
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list