Issue #14448: merge with 3.2

sandrotosi · sandrotosi · commit 17feca0efc1b · 2012-04-24T19:46:29.000+02:00
diff --git a/Doc/library/datetime.rst b/Doc/library/datetime.rst
@@ -1557,7 +1557,6 @@ Example :class:`tzinfo` classes:
 
 .. 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 @@ Applications that can't bear such ambiguities should avoid using hybrid
 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:
 
