summaryrefslogtreecommitdiffstats
path: root/Doc/faq
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2011-09-01 01:20:13 (GMT)
committerÉric Araujo <merwok@netwok.org>2011-09-01 01:20:13 (GMT)
commit7af8ebb6ce7576a629206d9c063c0914b9b576bc (patch)
tree36cc415b68f793b031bd3f035e4a45f4efc74695 /Doc/faq
parent37b5f9eebc0d7ce43c7e38e4ccd6d8ad904007b5 (diff)
downloadcpython-7af8ebb6ce7576a629206d9c063c0914b9b576bc.zip
cpython-7af8ebb6ce7576a629206d9c063c0914b9b576bc.tar.gz
cpython-7af8ebb6ce7576a629206d9c063c0914b9b576bc.tar.bz2
Adapt/remove mentions of functions gone in 3.x
Diffstat (limited to 'Doc/faq')
-rw-r--r--Doc/faq/programming.rst9
-rw-r--r--Doc/faq/windows.rst2
2 files changed, 1 insertions, 10 deletions
diff --git a/Doc/faq/programming.rst b/Doc/faq/programming.rst
index 8b2f047..d1a3daf 100644
--- a/Doc/faq/programming.rst
+++ b/Doc/faq/programming.rst
@@ -473,15 +473,6 @@ calling another function by using ``*`` and ``**``::
...
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
index 6b37faf..68a1b5c 100644
--- a/Doc/faq/windows.rst
+++ b/Doc/faq/windows.rst
@@ -543,7 +543,7 @@ with multithreading-DLL options (``/MD``).
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``