[Python-checkins] cpython (merge 3.2 -> default): merge with 3.2
sandro.tosi
python-checkins at python.org
Sat Jun 2 18:23:30 CEST 2012
http://hg.python.org/cpython/rev/dac347701b4f
changeset: 77302:dac347701b4f
parent: 77298:3bb35ad5d9da
parent: 77301:c41779327bac
user: Sandro Tosi <sandro.tosi at gmail.com>
date: Sat Jun 02 18:22:31 2012 +0200
summary:
merge with 3.2
files:
Doc/library/locale.rst | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Doc/library/locale.rst b/Doc/library/locale.rst
--- a/Doc/library/locale.rst
+++ b/Doc/library/locale.rst
@@ -160,22 +160,22 @@
.. 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 @@
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
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list