[Python-checkins] cpython (merge 3.2 -> default): Issue #14448: merge with 3.2

Tue Apr 24 19:48:11 CEST 2012

http://hg.python.org/cpython/rev/b46fa7bc6710
changeset: 76534:b46fa7bc6710
parent: 76531:224402f3ede4
parent: 76533:3aec41794584
user: Sandro Tosi <sandro.tosi at gmail.com>
date: Tue Apr 24 19:46:29 2012 +0200
summary:
 Issue #14448: merge with 3.2
files:
 Doc/library/datetime.rst | 10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/Doc/library/datetime.rst b/Doc/library/datetime.rst
--- a/Doc/library/datetime.rst
+++ b/Doc/library/datetime.rst
@@ -1557,7 +1557,6 @@
 
 .. literalinclude:: ../includes/tzinfo-examples.py
 
-
 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
 points. For concreteness, consider US Eastern (UTC -0500), where EDT begins the
@@ -1597,6 +1596,15 @@
 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)).
 
+.. 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:
 
-- 
Repository URL: http://hg.python.org/cpython
