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.
........
diff --git a/Doc/library/future_builtins.rst b/Doc/library/future_builtins.rst
index 7ee7110..16e7d4b 100644
--- a/Doc/library/future_builtins.rst
+++ b/Doc/library/future_builtins.rst
@@ -1,14 +1,14 @@
-:mod:`future_builtins` --- Python 3 builtins
-============================================
+:mod:`future_builtins` --- Python 3 built-ins
+=============================================
.. module:: future_builtins
.. sectionauthor:: Georg Brandl
.. versionadded:: 2.6
This module provides functions that exist in 2.x, but have different behavior in
-Python 3, so they cannot be put into the 2.x builtin namespace.
+Python 3, so they cannot be put into the 2.x builtins namespace.
-Instead, if you want to write code compatible with Python 3 builtins, import
+Instead, if you want to write code compatible with Python 3 built-ins, import
them from this module, like this::
from future_builtins import map, filter
@@ -16,17 +16,17 @@
... code using Python 3-style map and filter ...
The :term:`2to3` tool that ports Python 2 code to Python 3 will recognize
-this usage and leave the new builtins alone.
+this usage and leave the new built-ins alone.
.. note::
- The Python 3 :func:`print` function is already in the builtins, but cannot be
+ The Python 3 :func:`print` function is already in the built-ins, but cannot be
accessed from Python 2 code unless you use the appropriate future statement::
from __future__ import print_function
-Available builtins are:
+Available built-ins are:
.. function:: ascii(object)
@@ -42,7 +42,7 @@
.. function:: hex(object)
- Works like the builtin :func:`hex`, but instead of :meth:`__hex__` it will
+ Works like the built-in :func:`hex`, but instead of :meth:`__hex__` it will
use the :meth:`__index__` method on its argument to get an integer that is
then converted to hexadecimal.
@@ -52,7 +52,7 @@
.. function:: oct(object)
- Works like the builtin :func:`oct`, but instead of :meth:`__oct__` it will
+ Works like the built-in :func:`oct`, but instead of :meth:`__oct__` it will
use the :meth:`__index__` method on its argument to get an integer that is
then converted to octal.