Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Issue #14448: merge with 3.2

This commit is contained in:
Sandro Tosi 2012-04-24 19:46:29 +02:00
parent f4095837a7 d11d0d6343
commit 17feca0efc
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Doc/library/datetime.rst
View File

@ -1557,7 +1557,6 @@ Example :class:`tzinfo` classes:
.. literalinclude:: ../includes/tzinfo-examples.py .. literalinclude:: ../includes/tzinfo-examples.py
Note that there are unavoidable subtleties twice per year in a :class:`tzinfo` Note that there are unavoidable subtleties twice per year in a :class:`tzinfo`
subclass accounting for both standard and daylight time, at the DST transition subclass accounting for both standard and daylight time, at the DST transition
points. For concreteness, consider US Eastern (UTC -0500), where EDT begins the points. For concreteness, consider US Eastern (UTC -0500), where EDT begins the
@ -1597,6 +1596,15 @@ Applications that can't bear such ambiguities should avoid using hybrid
or any other fixed-offset :class:`tzinfo` subclass (such as a class representing or any other fixed-offset :class:`tzinfo` subclass (such as a class representing
only EST (fixed offset -5 hours), or only EDT (fixed offset -4 hours)). only EST (fixed offset -5 hours), or only EDT (fixed offset -4 hours)).
.. seealso::
`pytz <http://pypi.python.org/pypi/pytz/>`_
The Standard Library has no :class:`tzinfo` instances except for UTC, but
it exists a third-party library which brings Olson timezone database to
Python: `pytz`.
`pytz` contains up-to-date information and its usage is recommended.
.. _datetime-timezone: .. _datetime-timezone: