diff options
author | Benjamin Peterson <benjamin@python.org> | 2008-09-17 22:25:09 (GMT) |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2008-09-17 22:25:09 (GMT) |
commit | 5478b47355724de2ad891eea469fd8a1e674dccd (patch) | |
tree | 069268a8162c6392f681569597f8c39e67910eb0 /Doc/library | |
parent | 357877c8f14f361166b1909bf93a40650d3f5b4c (diff) | |
download | cpython-5478b47355724de2ad891eea469fd8a1e674dccd.zip cpython-5478b47355724de2ad891eea469fd8a1e674dccd.tar.gz cpython-5478b47355724de2ad891eea469fd8a1e674dccd.tar.bz2 |
Merged revisions 66457-66459,66465-66468,66483-66485,66487-66491 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r66457 | antoine.pitrou | 2008-09-13 15:30:30 -0500 (Sat, 13 Sep 2008) | 5 lines
Issue #3850: Misc/find_recursionlimit.py was broken.
Reviewed by A.M. Kuchling.
........
r66458 | benjamin.peterson | 2008-09-13 17:54:43 -0500 (Sat, 13 Sep 2008) | 1 line
fix a name issue; note all doc files should be encoded in utf8
........
r66459 | benjamin.peterson | 2008-09-14 11:02:22 -0500 (Sun, 14 Sep 2008) | 1 line
clarify that radix for int is not 'guessed'
........
r66465 | skip.montanaro | 2008-09-14 21:03:05 -0500 (Sun, 14 Sep 2008) | 3 lines
Review usage. Fix a mistake in the new-style class definition. Add a
couple new definitions (CPython and virtual machine).
........
r66466 | skip.montanaro | 2008-09-14 21:19:53 -0500 (Sun, 14 Sep 2008) | 2 lines
Pick up a few more definitions from the glossary on the wiki.
........
r66467 | benjamin.peterson | 2008-09-14 21:53:23 -0500 (Sun, 14 Sep 2008) | 1 line
mention that object.__init__ no longer takes arbitrary args and kwargs
........
r66468 | andrew.kuchling | 2008-09-15 08:08:32 -0500 (Mon, 15 Sep 2008) | 1 line
Rewrite item a bit
........
r66483 | georg.brandl | 2008-09-16 05:17:45 -0500 (Tue, 16 Sep 2008) | 2 lines
Fix typo.
........
r66484 | benjamin.peterson | 2008-09-16 16:20:28 -0500 (Tue, 16 Sep 2008) | 2 lines
be less wordy
........
r66485 | georg.brandl | 2008-09-17 03:45:54 -0500 (Wed, 17 Sep 2008) | 2 lines
#3888: add some deprecated modules in whatsnew.
........
r66487 | skip.montanaro | 2008-09-17 06:50:36 -0500 (Wed, 17 Sep 2008) | 2 lines
usage
........
r66488 | andrew.kuchling | 2008-09-17 07:57:04 -0500 (Wed, 17 Sep 2008) | 1 line
Markup fixes
........
r66489 | andrew.kuchling | 2008-09-17 07:58:22 -0500 (Wed, 17 Sep 2008) | 2 lines
Remove comment about improvement: pystone is about the same, and
the improvements seem to be difficult to quantify
........
r66490 | andrew.kuchling | 2008-09-17 08:04:53 -0500 (Wed, 17 Sep 2008) | 1 line
Note sqlite3 version; move item
........
r66491 | benjamin.peterson | 2008-09-17 16:54:56 -0500 (Wed, 17 Sep 2008) | 1 line
document compileall command flags
........
Diffstat (limited to 'Doc/library')
-rw-r--r-- | Doc/library/2to3.rst | 12 | ||||
-rw-r--r-- | Doc/library/collections.rst | 2 | ||||
-rw-r--r-- | Doc/library/compileall.rst | 9 |
3 files changed, 14 insertions, 9 deletions
diff --git a/Doc/library/2to3.rst b/Doc/library/2to3.rst index e8ea861..8040124 100644 --- a/Doc/library/2to3.rst +++ b/Doc/library/2to3.rst @@ -79,12 +79,12 @@ flag. Note that *only* doctests will be refactored. The :option:`-v` option enables the output of more information on the translation process. -When the :option:`-p` is passed to it, 2to3 treats ``print`` as a function -instead of a statement. This is useful when ``from __future__ import -print_function`` is being used. If this option is not given, the print fixer -will surround print calls in an extra set of parentheses because it cannot -differentiate between the and print statement with parentheses (such as ``print -("a" + "b" + "c")``) and a true function call. +When the :option:`-p` is passed, 2to3 treats ``print`` as a function instead of +a statement. This is useful when ``from __future__ import print_function`` is +being used. If this option is not given, the print fixer will surround print +calls in an extra set of parentheses because it cannot differentiate between the +and print statement with parentheses (such as ``print ("a" + "b" + "c")``) and a +true function call. :mod:`lib2to3` - 2to3's library diff --git a/Doc/library/collections.rst b/Doc/library/collections.rst index 94b6726..7dd8848 100644 --- a/Doc/library/collections.rst +++ b/Doc/library/collections.rst @@ -359,7 +359,7 @@ in Unix:: .. method:: defaultdict.__missing__(key) - If the :attr:`default_factory` attribute is ``None``, this raises an + If the :attr:`default_factory` attribute is ``None``, this raises a :exc:`KeyError` exception with the *key* as argument. If :attr:`default_factory` is not ``None``, it is called without arguments diff --git a/Doc/library/compileall.rst b/Doc/library/compileall.rst index d62b785..86f60fb 100644 --- a/Doc/library/compileall.rst +++ b/Doc/library/compileall.rst @@ -11,8 +11,13 @@ libraries. These functions compile Python source files in a directory tree, allowing users without permission to write to the libraries to take advantage of cached byte-code files. -The source file for this module may also be used as a script to compile Python -sources in directories named on the command line or in ``sys.path``. +This module may also be used as a script (using the :option:`-m` Python flag) to +compile Python sources. Directories to recursively traverse (passing +:option:`-l` stops the recursive behavior) for sources are listed on the command +line. If no arguments are given, the invocation is equivalent to ``-l +sys.path``. Printing lists of the files compiled can be disabled with the +:option:`-q` flag. In addition, the :option:`-x` option takes a regular +expression argument. All files that match the expression will be skipped. .. function:: compile_dir(dir[, maxlevels[, ddir[, force[, rx[, quiet]]]]]) |