diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-06-22 23:27:10 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-06-22 23:27:10 (GMT) |
| commit | 19db33fb081e02baefc319dd3caf39d75834f9eb (patch) | |
| tree | 4f07adc55d1cd3eb1deab1b16e8c79f232a9687c /Doc/library/datetime.rst | |
| parent | 425aaa11d88c3f831ebabf8ab3c51ffaa3c3f3d5 (diff) | |
| parent | 9b29acd1fe79ab3a157a95121da3c060e1c96469 (diff) | |
| download | cpython-19db33fb081e02baefc319dd3caf39d75834f9eb.zip cpython-19db33fb081e02baefc319dd3caf39d75834f9eb.tar.gz cpython-19db33fb081e02baefc319dd3caf39d75834f9eb.tar.bz2 | |
merge 3.4 (#16667)
Diffstat (limited to 'Doc/library/datetime.rst')
| -rw-r--r-- | Doc/library/datetime.rst | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Doc/library/datetime.rst b/Doc/library/datetime.rst index 553046f..a25d63f 100644 --- a/Doc/library/datetime.rst +++ b/Doc/library/datetime.rst @@ -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 |