diff options
| author | Georg Brandl <georg@python.org> | 2010-03-14 10:56:14 +0000 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2010-03-14 10:56:14 +0000 |
| commit | 93dc9eb2a39ccc84d50012f8133f05e81183e8a6 (patch) | |
| tree | 6f4fd2b8f7c457f56508450b8ba735e7169ebae1 /Doc/library | |
| parent | c0e22b7889a4b8b5002a1ac4ae25273e6d30ea6f (diff) | |
| download | cpython-git-93dc9eb2a39ccc84d50012f8133f05e81183e8a6.tar.gz | |
Merged revisions 78760,78771-78773,78802,78922,78952 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r78760 | georg.brandl | 2010-03-07 16:23:59 +0100 (So, 07 Mär 2010) | 1 line
#5341: more built-in vs builtin fixes.
........
r78771 | georg.brandl | 2010-03-07 21:58:31 +0100 (So, 07 Mär 2010) | 1 line
#8085: The function is called PyObject_NewVar, not PyObject_VarNew.
........
r78772 | georg.brandl | 2010-03-07 22:12:28 +0100 (So, 07 Mär 2010) | 1 line
#8039: document conditional expressions better, giving them their own section.
........
r78773 | georg.brandl | 2010-03-07 22:32:06 +0100 (So, 07 Mär 2010) | 1 line
#8044: document Py_{Enter,Leave}RecursiveCall functions.
........
r78802 | georg.brandl | 2010-03-08 17:28:40 +0100 (Mo, 08 Mär 2010) | 1 line
Fix typo.
........
r78922 | georg.brandl | 2010-03-13 14:41:58 +0100 (Sa, 13 Mär 2010) | 1 line
Update for new download location.
........
r78952 | georg.brandl | 2010-03-14 10:55:08 +0100 (So, 14 Mär 2010) | 1 line
#8137: add iso-8859-16 to the standard encodings table.
........
Diffstat (limited to 'Doc/library')
| -rw-r--r-- | Doc/library/argparse.rst | 2 | ||||
| -rw-r--r-- | Doc/library/codecs.rst | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/Doc/library/argparse.rst b/Doc/library/argparse.rst index edb28e8038..92ac6c414e 100644 --- a/Doc/library/argparse.rst +++ b/Doc/library/argparse.rst @@ -855,7 +855,7 @@ By default, ArgumentParser objects read command-line args in as simple strings. However, quite often the command-line string should instead be interpreted as another type, like a :class:`float`, :class:`int` or :class:`file`. The ``type`` keyword argument of :meth:`add_argument` allows any necessary -type-checking and type-conversions to be performed. Many common builtin types +type-checking and type-conversions to be performed. Many common built-in types can be used directly as the value of the ``type`` argument:: >>> parser = argparse.ArgumentParser() diff --git a/Doc/library/codecs.rst b/Doc/library/codecs.rst index 785f3f687a..13e86a24fe 100644 --- a/Doc/library/codecs.rst +++ b/Doc/library/codecs.rst @@ -1065,11 +1065,13 @@ particular, the following variants typically exist: +-----------------+--------------------------------+--------------------------------+ | iso8859_10 | iso-8859-10, latin6, L6 | Nordic languages | +-----------------+--------------------------------+--------------------------------+ -| iso8859_13 | iso-8859-13 | Baltic languages | +| iso8859_13 | iso-8859-13, latin7, L7 | Baltic languages | +-----------------+--------------------------------+--------------------------------+ | iso8859_14 | iso-8859-14, latin8, L8 | Celtic languages | +-----------------+--------------------------------+--------------------------------+ -| iso8859_15 | iso-8859-15 | Western Europe | +| iso8859_15 | iso-8859-15, latin9, L9 | Western Europe | ++-----------------+--------------------------------+--------------------------------+ +| iso8859_16 | iso-8859-16, latin10, L10 | South-Eastern Europe | +-----------------+--------------------------------+--------------------------------+ | johab | cp1361, ms1361 | Korean | +-----------------+--------------------------------+--------------------------------+ |