Port rev. 57009, also fix the docs for string.whitespace.

This commit is contained in:
Georg Brandl 2007-08-14 09:31:22 +00:00
parent 04be1fae70
commit 52f44e63e6
3 changed files with 18 additions and 38 deletions

View File

@ -27,6 +27,7 @@ are more than welcome as well.
style.rst
rest.rst
markup.rst
fromlatex.rst
sphinx.rst
.. XXX add credits, thanks etc.

View File

@ -53,22 +53,6 @@ The constants defined in this module are:
The string ``'0123456789abcdefABCDEF'``.
.. data:: letters
The concatenation of the strings :const:`lowercase` and :const:`uppercase`
described below. The specific value is locale-dependent, and will be updated
when :func:`locale.setlocale` is called.
.. data:: lowercase
A string containing all the characters that are considered lowercase letters.
On most systems this is the string ``'abcdefghijklmnopqrstuvwxyz'``. Do not
change its definition --- the effect on the routines :func:`upper` and
:func:`swapcase` is undefined. The specific value is locale-dependent, and will
be updated when :func:`locale.setlocale` is called.
.. data:: octdigits
The string ``'01234567'``.
@ -76,32 +60,22 @@ The constants defined in this module are:
.. data:: punctuation
String of ASCII characters which are considered punctuation characters in the
``C`` locale.
String of ASCII characters which are considered punctuation characters
in the ``C`` locale.
.. data:: printable
String of characters which are considered printable. This is a combination of
:const:`digits`, :const:`letters`, :const:`punctuation`, and
:const:`whitespace`.
.. data:: uppercase
A string containing all the characters that are considered uppercase letters.
On most systems this is the string ``'ABCDEFGHIJKLMNOPQRSTUVWXYZ'``. Do not
change its definition --- the effect on the routines :func:`lower` and
:func:`swapcase` is undefined. The specific value is locale-dependent, and will
be updated when :func:`locale.setlocale` is called.
String of ASCII characters which are considered printable. This is a
combination of :const:`digits`, :const:`ascii_letters`, :const:`punctuation`,
and :const:`whitespace`.
.. data:: whitespace
A string containing all characters that are considered whitespace. On most
systems this includes the characters space, tab, linefeed, return, formfeed, and
vertical tab. Do not change its definition --- the effect on the routines
:func:`strip` and :func:`split` is undefined.
A string containing all characters that are considered whitespace.
This includes the characters space, tab, linefeed, return, formfeed, and
vertical tab.
Template strings

View File

@ -102,7 +102,7 @@ fixes. Here's a partial list of the most notable changes, sorted alphabetically
by module name. Consult the :file:`Misc/NEWS` file in the source tree for a more
complete list of changes, or look through the CVS logs for all the details.
* New data type in the :mod:`collections` module: :class:`NamedTuple(typename,
* A new data type in the :mod:`collections` module: :class:`NamedTuple(typename,
fieldnames)` is a factory function that creates subclasses of the standard tuple
whose fields are accessible by name as well as index. For example::
@ -115,7 +115,7 @@ complete list of changes, or look through the CVS logs for all the details.
(Contributed by Raymond Hettinger.)
* New method in the :mod:`curses` module: for a window, :meth:`chgat` changes
* A new method in the :mod:`curses` module: for a window, :meth:`chgat` changes
the display characters for a certain number of characters on a single line. ::
# Boldface text starting at y=0,x=21
@ -124,9 +124,14 @@ complete list of changes, or look through the CVS logs for all the details.
(Contributed by Fabian Kreutz.)
* The :func:`glob.glob` function can now return Unicode filenames if
a Unicode path was used and Unicode filenames are matched within the directory.
.. % Patch #1001604
* The :mod:`gopherlib` module has been removed.
* New function in the :mod:`heapq` module: ``merge(iter1, iter2, ...)``
* A new function in the :mod:`heapq` module: ``merge(iter1, iter2, ...)``
takes any number of iterables that return data *in sorted order*, and returns
a new iterator that returns the contents of all the iterators, also in sorted
order. For example::
@ -136,7 +141,7 @@ complete list of changes, or look through the CVS logs for all the details.
(Contributed by Raymond Hettinger.)
* New function in the :mod:`itertools` module: ``izip_longest(iter1, iter2,
* A new function in the :mod:`itertools` module: ``izip_longest(iter1, iter2,
...[, fillvalue])`` makes tuples from each of the elements; if some of the
iterables are shorter than others, the missing values are set to *fillvalue*.
For example::