mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 16:39:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

merge 3.4 (#16667)

Browse source
This commit is contained in:
Benjamin Peterson 2014-06-22 16:27:10 -07:00
commit 19db33fb08
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Doc/library/datetime.rst
View file

@ -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
@ -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