diff options
| author | Éric Araujo <merwok@netwok.org> | 2011-09-01 03:57:12 (GMT) |
|---|---|---|
| committer | Éric Araujo <merwok@netwok.org> | 2011-09-01 03:57:12 (GMT) |
| commit | b8edbdf4b986048e48b689baf339023c38384ae7 (patch) | |
| tree | 33d61ab7d6e5252b6f5cd682ce45d92cfbfc896b /Doc/faq | |
| parent | 95fc53f2b378e603dadb3629597b053c13e45965 (diff) | |
| parent | 7af8ebb6ce7576a629206d9c063c0914b9b576bc (diff) | |
| download | cpython-b8edbdf4b986048e48b689baf339023c38384ae7.zip cpython-b8edbdf4b986048e48b689baf339023c38384ae7.tar.gz cpython-b8edbdf4b986048e48b689baf339023c38384ae7.tar.bz2 | |
Merge doc changes from 3.2.
rstlint complains about packaging docs but I’m working on those in
another patch.
Diffstat (limited to 'Doc/faq')
| -rw-r--r-- | Doc/faq/design.rst | 2 | ||||
| -rw-r--r-- | Doc/faq/programming.rst | 9 | ||||
| -rw-r--r-- | Doc/faq/windows.rst | 4 |
3 files changed, 3 insertions, 12 deletions
diff --git a/Doc/faq/design.rst b/Doc/faq/design.rst index b9faf57..1f3135a 100644 --- a/Doc/faq/design.rst +++ b/Doc/faq/design.rst @@ -667,7 +667,7 @@ construction of large programs. Python 2.6 adds an :mod:`abc` module that lets you define Abstract Base Classes (ABCs). You can then use :func:`isinstance` and :func:`issubclass` to check whether an instance or a class implements a particular ABC. The -:mod:`collections` modules defines a set of useful ABCs such as +:mod:`collections.abc` module defines a set of useful ABCs such as :class:`Iterable`, :class:`Container`, and :class:`MutableMapping`. For Python, many of the advantages of interface specifications can be obtained 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 8a20950..68a1b5c 100644 --- a/Doc/faq/windows.rst +++ b/Doc/faq/windows.rst @@ -543,10 +543,10 @@ 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 an "_d" +wish to use the Debug Multithreaded DLL, then your module *must* have ``_d`` appended to the base name. |