traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge with 3.2

This commit is contained in:
Sandro Tosi 2012-06-02 18:22:31 +02:00
parent f4b26ef250 964f205a34
commit a894cbfa61
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Doc/library/locale.rst
View File

@ -160,22 +160,22 @@ The :mod:`locale` module defines the following exception and functions:
.. data:: D_T_FMT
Get a string that can be used as a format string for :func:`strftime` to
Get a string that can be used as a format string for :func:`time.strftime` to
represent date and time in a locale-specific way.
.. data:: D_FMT
Get a string that can be used as a format string for :func:`strftime` to
Get a string that can be used as a format string for :func:`time.strftime` to
represent a date in a locale-specific way.
.. data:: T_FMT
Get a string that can be used as a format string for :func:`strftime` to
Get a string that can be used as a format string for :func:`time.strftime` to
represent a time in a locale-specific way.
.. data:: T_FMT_AMPM
Get a format string for :func:`strftime` to represent time in the am/pm
Get a format string for :func:`time.strftime` to represent time in the am/pm
format.
.. data:: DAY_1 ... DAY_7
@ -239,24 +239,24 @@ The :mod:`locale` module defines the following exception and functions:
then-emperor's reign.
Normally it should not be necessary to use this value directly. Specifying
the ``E`` modifier in their format strings causes the :func:`strftime`
the ``E`` modifier in their format strings causes the :func:`time.strftime`
function to use this information. The format of the returned string is not
specified, and therefore you should not assume knowledge of it on different
systems.
.. data:: ERA_D_T_FMT
Get a format string for :func:`strftime` to represent date and time in a
Get a format string for :func:`time.strftime` to represent date and time in a
locale-specific era-based way.
.. data:: ERA_D_FMT
Get a format string for :func:`strftime` to represent a date in a
Get a format string for :func:`time.strftime` to represent a date in a
locale-specific era-based way.
.. data:: ERA_T_FMT
Get a format string for :func:`strftime` to represent a time in a
Get a format string for :func:`time.strftime` to represent a time in a
locale-specific era-based way.
.. data:: ALT_DIGITS