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

Issue #14448: merge with 3.2

This commit is contained in:
Sandro Tosi 2012-04-28 11:19:59 +02:00
parent b11d91d969 100b889ccd
commit 4aff7ed332
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Doc/library/datetime.rst
View File

@ -1599,11 +1599,18 @@ only EST (fixed offset -5 hours), or only EDT (fixed offset -4 hours)).
.. seealso:: .. seealso::
`pytz <http://pypi.python.org/pypi/pytz/>`_ `pytz <http://pypi.python.org/pypi/pytz/>`_
The Standard Library has no :class:`tzinfo` instances except for UTC, but The standard library has no :class:`tzinfo` instances except for UTC, but
it exists a third-party library which brings Olson timezone database to there exists a third-party library which brings the *IANA timezone
Python: `pytz`. database* (also known as the Olson database) to Python: *pytz*.
`pytz` contains up-to-date information and its usage is recommended. *pytz* contains up-to-date information and its usage is recommended.
`IANA timezone database <http://www.iana.org/time-zones>`_
The Time Zone Database (often called tz or zoneinfo) contains code and
data that represent the history of local time for many representative
locations around the globe. It is updated periodically to reflect changes
made by political bodies to time zone boundaries, UTC offsets, and
daylight-saving rules.
.. _datetime-timezone: .. _datetime-timezone: