diff options
author | Alexander Belopolsky <abalkin@users.noreply.github.com> | 2018-06-10 21:02:58 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-10 21:02:58 (GMT) |
commit | 877b23202b7e7d4f57b58504fd0eb886e8c0b377 (patch) | |
tree | da6e7b1d515204db9e603a7aa3e01ab222dc2c3b /Doc | |
parent | af4b0130d44bf8a1ff4f7b46195d1dc79add444a (diff) | |
download | cpython-877b23202b7e7d4f57b58504fd0eb886e8c0b377.zip cpython-877b23202b7e7d4f57b58504fd0eb886e8c0b377.tar.gz cpython-877b23202b7e7d4f57b58504fd0eb886e8c0b377.tar.bz2 |
bpo-33812: Corrected astimezone for naive datetimes. (GH-7578)
A datetime object d is aware if d.tzinfo is not None and
d.tzinfo.utcoffset(d) does not return None. If d.tzinfo is None,
or if d.tzinfo is not None but d.tzinfo.utcoffset(d) returns None,
d is naive.
This commit ensures that instances with non-None d.tzinfo, but
d.tzinfo.utcoffset(d) returning None are treated as naive.
In addition, C acceleration code will raise TypeError if
d.tzinfo.utcoffset(d) returns an object with the type other than
timedelta.
* Updated the documentation.
Assume that the term "naive" is defined elsewhere and remove the
not entirely correct clarification. Thanks, Tim.
Diffstat (limited to 'Doc')
-rw-r--r-- | Doc/library/datetime.rst | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Doc/library/datetime.rst b/Doc/library/datetime.rst index 8d91f4e..1ac2570 100644 --- a/Doc/library/datetime.rst +++ b/Doc/library/datetime.rst @@ -1058,8 +1058,7 @@ Instance methods: If provided, *tz* must be an instance of a :class:`tzinfo` subclass, and its :meth:`utcoffset` and :meth:`dst` methods must not return ``None``. If *self* - is naive (``self.tzinfo is None``), it is presumed to represent time in the - system timezone. + is naive, it is presumed to represent time in the system timezone. If called without arguments (or with ``tz=None``) the system local timezone is assumed for the target timezone. The ``.tzinfo`` attribute of the converted |