mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-02 05:12:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 82548,82634-82635 via svnmerge from

Browse source 
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.
  ........
................
This commit is contained in:
Georg Brandl 2010-07-09 07:51:43 +00:00
parent 1d68f6510c
commit 39db30c3e5
6 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Doc/distutils/apiref.rst
View file

@ -1012,7 +1012,7 @@ directories.
errors are ignored (apart from being reported to ``sys.stdout`` if *verbose* is errors are ignored (apart from being reported to ``sys.stdout`` if *verbose* is
true). 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 :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 the "negative alias" of :option:`--verbose`, then :option:`--quiet` on the
command line sets *verbose* to false. command line sets *verbose* to false.
**\*\*** Should be replaced with :mod:`optik` (which is also now known as .. XXX Should be replaced with :mod:`optparse`.
:mod:`optparse` in Python 2.3 and later). **\*\***
.. function:: fancy_getopt(options, negative_opt, object, args) .. function:: fancy_getopt(options, negative_opt, object, args)

4
Doc/distutils/builtdist.rst
View file

@ -143,8 +143,8 @@ commands.
Creating dumb built distributions Creating dumb built distributions
================================= =================================
**\*\*** Need to document absolute vs. prefix-relative packages here, but first .. XXX Need to document absolute vs. prefix-relative packages here, but first
I have to implement it! **\*\*** I have to implement it!
.. _creating-rpms: .. _creating-rpms:

4
Doc/distutils/setupscript.rst
View file

@ -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 SWIG on the interface file and compile the resulting C/C++ file into your
extension. 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 warning notwithstanding, options to SWIG can be currently passed like
this:: 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 (Again, this sort of non-portable construct should be avoided if you intend to
distribute your code.) distribute your code.)
**\*\*** Should mention clib libraries here or somewhere else! **\*\*** .. XXX Should mention clib libraries here or somewhere else!
Other options Other options

6
Doc/distutils/sourcedist.rst
View file

@ -68,10 +68,10 @@ source distribution:
:option:`packages` options :option:`packages` options
* all C source files mentioned in the :option:`ext_modules` or * all C source files mentioned in the :option:`ext_modules` or
:option:`libraries` options ( :option:`libraries` options
**\*\*** getting C library sources currently broken---no .. XXX Getting C library sources is currently broken -- no
:meth:`get_source_files` method in :file:`build_clib.py`! **\*\***) :meth:`get_source_files` method in :file:`build_clib.py`!
* scripts identified by the :option:`scripts` option * scripts identified by the :option:`scripts` option

5
Doc/library/functions.rst
View file

@ -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 iterable if function(item)]`` if function is not ``None`` and ``[item for item
in iterable if item]`` if function is ``None``. in iterable if item]`` if function is ``None``.
See :func:`itertools.ifilterfalse` for the complementary function that returns See :func:`itertools.ifilter` and :func:`itertools.ifilterfalse` for iterator
elements of *iterable* for which *function* returns false. versions of this function, including a variation that filters for elements
where the *function* returns false.
.. function:: float([x]) .. function:: float([x])

2
Doc/using/cmdline.rst
View file

@ -58,7 +58,7 @@ source.
.. cmdoption:: -c <command> .. cmdoption:: -c <command>
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 statements separated by newlines, with significant leading whitespace as in
normal module code. normal module code.