From: Georg Brandl Date: Fri, 9 Jul 2010 07:51:43 +0000 (+0000) Subject: Merged revisions 82548,82634-82635 via svnmerge from X-Git-Tag: v2.6.6rc1~134 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=39db30c3e5d12ea5a9bfe101bf88e842c5df48f2;p=python Merged revisions 82548,82634-82635 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/release27-maint ................ r82548 | georg.brandl | 2010-07-04 19:28:33 +0200 (So, 04 Jul 2010) | 1 line #8472: fix misleading reference to ifilterfalse() in filter() docs. ................ r82634 | georg.brandl | 2010-07-07 21:05:35 +0200 (Mi, 07 Jul 2010) | 13 lines Merged revisions 82629,82632 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r82629 | georg.brandl | 2010-07-07 20:51:43 +0200 (Mi, 07 Jul 2010) | 1 line Make comment out of an awkward note. ........ r82632 | georg.brandl | 2010-07-07 21:04:36 +0200 (Mi, 07 Jul 2010) | 1 line Turn more notes into comments. ........ ................ r82635 | georg.brandl | 2010-07-07 21:09:12 +0200 (Mi, 07 Jul 2010) | 9 lines Merged revisions 82615 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r82615 | georg.brandl | 2010-07-07 00:58:50 +0200 (Mi, 07 Jul 2010) | 1 line Fix typo. ........ ................ --- diff --git a/Doc/distutils/apiref.rst b/Doc/distutils/apiref.rst index 71116e6d87..7874415f52 100644 --- a/Doc/distutils/apiref.rst +++ b/Doc/distutils/apiref.rst @@ -1012,7 +1012,7 @@ directories. errors are ignored (apart from being reported to ``sys.stdout`` if *verbose* is true). -**\*\*** Some of this could be replaced with the shutil module? **\*\*** +.. XXX Some of this could be replaced with the shutil module? :mod:`distutils.file_util` --- Single file operations @@ -1328,8 +1328,7 @@ provides the following additional features: the "negative alias" of :option:`--verbose`, then :option:`--quiet` on the command line sets *verbose* to false. -**\*\*** Should be replaced with :mod:`optik` (which is also now known as -:mod:`optparse` in Python 2.3 and later). **\*\*** +.. XXX Should be replaced with :mod:`optparse`. .. function:: fancy_getopt(options, negative_opt, object, args) diff --git a/Doc/distutils/builtdist.rst b/Doc/distutils/builtdist.rst index ade5dfa561..8615cbb243 100644 --- a/Doc/distutils/builtdist.rst +++ b/Doc/distutils/builtdist.rst @@ -143,8 +143,8 @@ commands. Creating dumb built distributions ================================= -**\*\*** Need to document absolute vs. prefix-relative packages here, but first -I have to implement it! **\*\*** +.. XXX Need to document absolute vs. prefix-relative packages here, but first + I have to implement it! .. _creating-rpms: diff --git a/Doc/distutils/setupscript.rst b/Doc/distutils/setupscript.rst index 06d3e9fd99..b63e2094ca 100644 --- a/Doc/distutils/setupscript.rst +++ b/Doc/distutils/setupscript.rst @@ -207,7 +207,7 @@ However, you can also include SWIG interface (:file:`.i`) files in the list; the SWIG on the interface file and compile the resulting C/C++ file into your extension. -**\*\*** SWIG support is rough around the edges and largely untested! **\*\*** +.. XXX SWIG support is rough around the edges and largely untested! This warning notwithstanding, options to SWIG can be currently passed like this:: @@ -326,7 +326,7 @@ include the location in ``library_dirs``:: (Again, this sort of non-portable construct should be avoided if you intend to distribute your code.) -**\*\*** Should mention clib libraries here or somewhere else! **\*\*** +.. XXX Should mention clib libraries here or somewhere else! Other options diff --git a/Doc/distutils/sourcedist.rst b/Doc/distutils/sourcedist.rst index b45515d8d9..9febd10622 100644 --- a/Doc/distutils/sourcedist.rst +++ b/Doc/distutils/sourcedist.rst @@ -68,10 +68,10 @@ source distribution: :option:`packages` options * all C source files mentioned in the :option:`ext_modules` or - :option:`libraries` options ( + :option:`libraries` options - **\*\*** getting C library sources currently broken---no - :meth:`get_source_files` method in :file:`build_clib.py`! **\*\***) + .. XXX Getting C library sources is currently broken -- no + :meth:`get_source_files` method in :file:`build_clib.py`! * scripts identified by the :option:`scripts` option diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst index ff0004e8f4..a70a29de1c 100644 --- a/Doc/library/functions.rst +++ b/Doc/library/functions.rst @@ -399,8 +399,9 @@ available. They are listed here in alphabetical order. iterable if function(item)]`` if function is not ``None`` and ``[item for item in iterable if item]`` if function is ``None``. - See :func:`itertools.ifilterfalse` for the complementary function that returns - elements of *iterable* for which *function* returns false. + See :func:`itertools.ifilter` and :func:`itertools.ifilterfalse` for iterator + versions of this function, including a variation that filters for elements + where the *function* returns false. .. function:: float([x]) diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst index ae9c88f7f8..b41d2444a5 100644 --- a/Doc/using/cmdline.rst +++ b/Doc/using/cmdline.rst @@ -58,7 +58,7 @@ source. .. cmdoption:: -c - Execute the Python code in *command*. *command* can be one ore more + Execute the Python code in *command*. *command* can be one or more statements separated by newlines, with significant leading whitespace as in normal module code.