diff -r c9271854e826 Doc/library/argparse.rst --- a/Doc/library/argparse.rst Sun Mar 07 01:00:37 2010 +0100 +++ b/Doc/library/argparse.rst Sun Mar 07 06:47:54 2010 +0100 @@ -855,7 +855,7 @@ By default, ArgumentParser objects read 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 -r c9271854e826 Doc/reference/executionmodel.rst --- a/Doc/reference/executionmodel.rst Sun Mar 07 01:00:37 2010 +0100 +++ b/Doc/reference/executionmodel.rst Sun Mar 07 06:47:54 2010 +0100 @@ -119,7 +119,7 @@ searched. The global statement must pre .. index:: pair: restricted; execution -The built-in namespace associated with the execution of a code block is actually +The builtins namespace associated with the execution of a code block is actually found by looking up the name ``__builtins__`` in its global namespace; this should be a dictionary or a module (in the latter case the module's dictionary is used). By default, when in the :mod:`__main__` module, ``__builtins__`` is @@ -131,7 +131,7 @@ weak form of restricted execution. .. impl-detail:: Users should not touch ``__builtins__``; it is strictly an implementation - detail. Users wanting to override values in the built-in namespace should + detail. Users wanting to override values in the builtins namespace should :keyword:`import` the :mod:`__builtin__` (no 's') module and modify its attributes appropriately. diff -r c9271854e826 Doc/whatsnew/2.6.rst --- a/Doc/whatsnew/2.6.rst Sun Mar 07 01:00:37 2010 +0100 +++ b/Doc/whatsnew/2.6.rst Sun Mar 07 06:47:54 2010 +0100 @@ -109,9 +109,9 @@ are: :func:`reduce` function. Python 3.0 adds several new built-in functions and changes the -semantics of some existing built-ins. Functions that are new in 3.0 +semantics of some existing builtins. Functions that are new in 3.0 such as :func:`bin` have simply been added to Python 2.6, but existing -built-ins haven't been changed; instead, the :mod:`future_builtins` +builtins haven't been changed; instead, the :mod:`future_builtins` module has versions with the new 3.0 semantics. Code written to be compatible with 3.0 can do ``from future_builtins import hex, map`` as necessary. @@ -833,7 +833,7 @@ formatted. It receives a single argumen else: return str(self) -There's also a :func:`format` built-in that will format a single +There's also a :func:`format` builtin that will format a single value. It calls the type's :meth:`__format__` method with the provided specifier:: @@ -1164,7 +1164,7 @@ access protocol. Abstract Base Classes feature for Python. The ABC support consists of an :mod:`abc` module containing a metaclass called :class:`ABCMeta`, special handling of this metaclass by the :func:`isinstance` and :func:`issubclass` -built-ins, and a collection of basic ABCs that the Python developers +builtins, and a collection of basic ABCs that the Python developers think will be widely useful. Future versions of Python will probably add more ABCs. @@ -1318,9 +1318,9 @@ an octal number, but it does add support >>> 0b101111 47 -The :func:`oct` built-in still returns numbers +The :func:`oct` builtin still returns numbers prefixed with a leading zero, and a new :func:`bin` -built-in returns the binary representation for a number:: +builtin returns the binary representation for a number:: >>> oct(42) '052' @@ -1329,7 +1329,7 @@ built-in returns the binary representati >>> bin(173) '0b10101101' -The :func:`int` and :func:`long` built-ins will now accept the "0o" +The :func:`int` and :func:`long` builtins will now accept the "0o" and "0b" prefixes when base-8 or base-2 are requested, or when the *base* argument is zero (signalling that the base used should be determined from the string):: @@ -1415,7 +1415,7 @@ can be shifted left and right with ``<<` combined using bitwise operations such as ``&`` and ``|``, and can be used as array indexes and slice boundaries. -In Python 3.0, the PEP slightly redefines the existing built-ins +In Python 3.0, the PEP slightly redefines the existing builtins :func:`round`, :func:`math.floor`, :func:`math.ceil`, and adds a new one, :func:`math.trunc`, that's been backported to Python 2.6. :func:`math.trunc` rounds toward zero, returning the closest @@ -1523,7 +1523,7 @@ Some smaller changes made to the core Py Previously this would have been a syntax error. (Contributed by Amaury Forgeot d'Arc; :issue:`3473`.) -* A new built-in, ``next(iterator, [default])`` returns the next item +* A new builtin, ``next(iterator, [default])`` returns the next item from the specified iterator. If the *default* argument is supplied, it will be returned if *iterator* has been exhausted; otherwise, the :exc:`StopIteration` exception will be raised. (Backported @@ -1952,9 +1952,9 @@ changes, or look through the Subversion (Contributed by Phil Schwartz; :issue:`1221598`.) * The :func:`reduce` built-in function is also available in the - :mod:`functools` module. In Python 3.0, the built-in has been + :mod:`functools` module. In Python 3.0, the builtin has been dropped and :func:`reduce` is only available from :mod:`functools`; - currently there are no plans to drop the built-in in the 2.x series. + currently there are no plans to drop the builtin in the 2.x series. (Patched by Christian Heimes; :issue:`1739906`.) * When possible, the :mod:`getpass` module will now use @@ -2756,7 +2756,7 @@ The functions in this module currently i * ``filter(predicate, iterable)``, ``map(func, iterable1, ...)``: the 3.0 versions - return iterators, unlike the 2.x built-ins which return lists. + return iterators, unlike the 2.x builtins which return lists. * ``hex(value)``, ``oct(value)``: instead of calling the :meth:`__hex__` or :meth:`__oct__` methods, these versions will