diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2012-11-27 17:18:47 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2012-11-27 17:18:47 (GMT) |
| commit | 7768dd77c195f14359a7b858017ebb813f839bae (patch) | |
| tree | 76cac34b8466acb64391f3aa467424d6abb8e2ab /Doc/library/string.rst | |
| parent | c48303404858b06411ddadf8db5f3376aa52772d (diff) | |
| parent | 28c88f48f9dd6943a20758e733806cbaf735e139 (diff) | |
| download | cpython-7768dd77c195f14359a7b858017ebb813f839bae.zip cpython-7768dd77c195f14359a7b858017ebb813f839bae.tar.gz cpython-7768dd77c195f14359a7b858017ebb813f839bae.tar.bz2 | |
#16556: merge with 3.2.
Diffstat (limited to 'Doc/library/string.rst')
| -rw-r--r-- | Doc/library/string.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/string.rst b/Doc/library/string.rst index 9c63272..f981f4e 100644 --- a/Doc/library/string.rst +++ b/Doc/library/string.rst @@ -100,7 +100,7 @@ implementation as the built-in :meth:`format` method. This function does the actual work of formatting. It is exposed as a separate function for cases where you want to pass in a predefined dictionary of arguments, rather than unpacking and repacking the - dictionary as individual arguments using the ``*args`` and ``**kwds`` + dictionary as individual arguments using the ``*args`` and ``**kwargs`` syntax. :meth:`vformat` does the work of breaking up the format string into character data and replacement fields. It calls the various methods described below. |