Skip to content

Commit

Permalink
merge 3.4 (#16667)
Browse files Browse the repository at this point in the history
  • Loading branch information
benjaminp committed Jun 22, 2014
2 parents c5646be + 2c02dc7 commit 5a37120
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions Doc/library/datetime.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1692,11 +1692,11 @@ 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
there exists a third-party library which brings the *IANA timezone
database* (also known as the Olson database) to Python: *pytz*.
The standard library has :class:`timezone` class for handling arbitrary
fixed offsets from UTC and :attr:`timezone.utc` as UTC timezone instance.

*pytz* contains up-to-date information and its usage is recommended.
*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
Expand Down Expand Up @@ -1733,6 +1733,8 @@ made to civil time.
*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
Expand Down

0 comments on commit 5a37120

Please sign in to comment.