[Python-checkins] cpython (3.2): Adapt/remove mentions of functions gone in 3.x

Sun Sep 4 08:42:35 CEST 2011

http://hg.python.org/cpython/rev/6972e2a45a57
changeset: 72246:6972e2a45a57
branch: 3.2
user: Éric Araujo <merwok at netwok.org>
date: Thu Sep 01 03:20:13 2011 +0200
summary:
 Adapt/remove mentions of functions gone in 3.x
files:
 Doc/faq/programming.rst | 9 ---------
 Doc/faq/windows.rst | 2 +-
 Doc/glossary.rst | 2 +-
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/Doc/faq/programming.rst b/Doc/faq/programming.rst
--- a/Doc/faq/programming.rst
+++ b/Doc/faq/programming.rst
@@ -473,15 +473,6 @@
 ...
 g(x, *args, **kwargs)
 
-In the unlikely case that you care about Python versions older than 2.0, use
-:func:`apply`::
-
- def f(x, *args, **kwargs):
- ...
- kwargs['width'] = '14.3c'
- ...
- apply(g, (x,)+args, kwargs)
-
 
 How do I write a function with output parameters (call by reference)?
 ---------------------------------------------------------------------
diff --git a/Doc/faq/windows.rst b/Doc/faq/windows.rst
--- a/Doc/faq/windows.rst
+++ b/Doc/faq/windows.rst
@@ -543,7 +543,7 @@
 
 If you can't change compilers or flags, try using :c:func:`Py_RunSimpleString`.
 A trick to get it to run an arbitrary file is to construct a call to
-:func:`execfile` with the name of your file as argument.
+:func:`exec` and :func:`open` with the name of your file as argument.
 
 Also note that you can not mix-and-match Debug and Release versions. If you
 wish to use the Debug Multithreaded DLL, then your module *must* have ``_d``
diff --git a/Doc/glossary.rst b/Doc/glossary.rst
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -489,7 +489,7 @@
 :func:`builtins.open` and :func:`os.open` are distinguished by their
 namespaces. Namespaces also aid readability and maintainability by making
 it clear which module implements a function. For instance, writing
- :func:`random.seed` or :func:`itertools.izip` makes it clear that those
+ :func:`random.seed` or :func:`itertools.islice` makes it clear that those
 functions are implemented by the :mod:`random` and :mod:`itertools`
 modules, respectively.
 
-- 
Repository URL: http://hg.python.org/cpython
