From 25df3d741f365a245e09d92a66c150ec4e62cdf8 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Sun, 20 Dec 2009 15:25:18 +0000 Subject: [PATCH] Merged revisions 76927 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r76927 | benjamin.peterson | 2009-12-20 09:23:22 -0600 (Sun, 20 Dec 2009) | 1 line builtin-ins -> builtins ........ --- Doc/library/future_builtins.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Doc/library/future_builtins.rst b/Doc/library/future_builtins.rst index 16e7d4bcf1..04f20526ca 100644 --- a/Doc/library/future_builtins.rst +++ b/Doc/library/future_builtins.rst @@ -1,5 +1,5 @@ -:mod:`future_builtins` --- Python 3 built-ins -============================================= +:mod:`future_builtins` --- Python 3 builtins +============================================ .. module:: future_builtins .. sectionauthor:: Georg Brandl @@ -8,7 +8,7 @@ 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 builtins namespace. -Instead, if you want to write code compatible with Python 3 built-ins, import +Instead, if you want to write code compatible with Python 3 builtins, import them from this module, like this:: from future_builtins import map, filter @@ -16,17 +16,17 @@ them from this module, like this:: ... 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 built-ins alone. +this usage and leave the new builtins alone. .. note:: - The Python 3 :func:`print` function is already in the built-ins, but cannot be + The Python 3 :func:`print` function is already in the builtins, but cannot be accessed from Python 2 code unless you use the appropriate future statement:: from __future__ import print_function -Available built-ins are: +Available builtins are: .. function:: ascii(object) -- 2.50.1