mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 02:39:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

merge with 3.3

Browse source
This commit is contained in:
Georg Brandl 2013-10-13 18:38:53 +02:00
commit ef1605afa8
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Doc/library/datetime.rst
View file

@ -1784,7 +1784,8 @@ values. If they're used anyway, ``0`` is substituted for them.
The full set of format codes supported varies across platforms, because Python The full set of format codes supported varies across platforms, because Python
calls the platform C library's :func:`strftime` function, and platform calls the platform C library's :func:`strftime` function, and platform
variations are common. variations are common. To see the full set of format codes supported on your
platform, consult the :manpage:`strftime(3)` documentation.
The following is a list of all the format codes that the C standard (1989 The following is a list of all the format codes that the C standard (1989
version) requires, and these work on all platforms with a standard C version) requires, and these work on all platforms with a standard C

6
Doc/library/time.rst
View file

@ -471,8 +471,10 @@ The module defines the following functions and data items:
>>> strftime("%a, %d %b %Y %H:%M:%S +0000", gmtime()) >>> strftime("%a, %d %b %Y %H:%M:%S +0000", gmtime())
'Thu, 28 Jun 2001 14:17:15 +0000' 'Thu, 28 Jun 2001 14:17:15 +0000'
Additional directives may be supported on certain platforms, but only the ones Additional directives may be supported on certain platforms, but only the
listed here have a meaning standardized by ANSI C. ones listed here have a meaning standardized by ANSI C. To see the full set
of format codes supported on your platform, consult the :manpage:`strftime(3)`
documentation.
On some platforms, an optional field width and precision specification can On some platforms, an optional field width and precision specification can
immediately follow the initial ``'%'`` of a directive in the following order; immediately follow the initial ``'%'`` of a directive in the following order;