diff options
| author | Georg Brandl <georg@python.org> | 2009-07-26 14:54:51 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2009-07-26 14:54:51 (GMT) |
| commit | 22b3431426349a424e3486c279db8b84cf671da0 (patch) | |
| tree | db3aa6b6addb5e07c53de6ff2a5e8250d472bb58 /Doc/whatsnew | |
| parent | 7a72b3ad7b02612254c7e256b8a67ce7ccf7994a (diff) | |
| download | cpython-22b3431426349a424e3486c279db8b84cf671da0.zip cpython-22b3431426349a424e3486c279db8b84cf671da0.tar.gz cpython-22b3431426349a424e3486c279db8b84cf671da0.tar.bz2 | |
Merged revisions 74209 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r74209 | georg.brandl | 2009-07-26 16:37:28 +0200 (So, 26 Jul 2009) | 1 line
builtin -> built-in.
........
Diffstat (limited to 'Doc/whatsnew')
| -rw-r--r-- | Doc/whatsnew/2.2.rst | 2 | ||||
| -rw-r--r-- | Doc/whatsnew/2.6.rst | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Doc/whatsnew/2.2.rst b/Doc/whatsnew/2.2.rst index ec435f7..acdba83 100644 --- a/Doc/whatsnew/2.2.rst +++ b/Doc/whatsnew/2.2.rst @@ -1173,7 +1173,7 @@ Some of the more notable changes are: can uncomment them. Gestalt and Internet Config modules are enabled by default. -* Keyword arguments passed to builtin functions that don't take them now cause a +* Keyword arguments passed to built-in functions that don't take them now cause a :exc:`TypeError` exception to be raised, with the message "*function* takes no keyword arguments". diff --git a/Doc/whatsnew/2.6.rst b/Doc/whatsnew/2.6.rst index fc1525e..cc8a29a 100644 --- a/Doc/whatsnew/2.6.rst +++ b/Doc/whatsnew/2.6.rst @@ -2823,7 +2823,7 @@ JSON (Javascript Object Notation). JSON is a lightweight interchange format often used in web applications. For more information about JSON, see http://www.json.org. -:mod:`json` comes with support for decoding and encoding most builtin Python +:mod:`json` comes with support for decoding and encoding most built-in Python types. The following example encodes and decodes a dictionary:: >>> import json |