[Python-checkins] cpython (merge 3.4 -> default): merge 3.4 (#16667)

[benjamin.peterson]

http://hg.python.org/cpython/rev/7dc94337ef67
changeset:   91336:7dc94337ef67
parent:      91334:e257a58bd718
parent:      91335:b32174cad588
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Jun 22 16:27:10 2014 -0700
summary:
  merge 3.4 (#16667)

files:
  Doc/library/datetime.rst |  12 +++++++-----
  1 files changed, 7 insertions(+), 5 deletions(-)


diff --git a/Doc/library/datetime.rst b/Doc/library/datetime.rst
--- a/Doc/library/datetime.rst
+++ b/Doc/library/datetime.rst
@@ -1692,11 +1692,11 @@
 .. seealso::
 
    `pytz <http://pypi.python.org/pypi/pytz/>`_
-      The standard library has no :class:`tzinfo` instances except for UTC, but
-      there exists a third-party library which brings the *IANA timezone
-      database* (also known as the Olson database) to Python: *pytz*.
-
-      *pytz* contains up-to-date information and its usage is recommended.
+      The standard library has :class:`timezone` class for handling arbitrary
+      fixed offsets from UTC and :attr:`timezone.utc` as UTC timezone instance.
+
+      *pytz* library brings the *IANA timezone database* (also known as the
+      Olson database) to Python 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
@@ -1733,6 +1733,8 @@
   *offset*, HH and MM are two digits of ``offset.hours`` and
   ``offset.minutes`` respectively.
 
+  .. versionadded:: 3.2
+
 .. method:: timezone.utcoffset(dt)
 
   Return the fixed value specified when the :class:`timezone` instance is

-- 
Repository URL: http://hg.python.org/cpython