summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2012-06-24 20:42:05 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2012-06-24 20:42:05 (GMT)
commitf55100132288304b8e5d4798bbb7929a512e9b57 (patch)
treec6cd24a8097605767131b83cf71090f756de9b99
parentad09b5ddb943465e4722fb6c01e8757252562a89 (diff)
parent217aa554faff873e6a4f36d28b89a27de2f2229a (diff)
downloadcpython-f55100132288304b8e5d4798bbb7929a512e9b57.zip
cpython-f55100132288304b8e5d4798bbb7929a512e9b57.tar.gz
cpython-f55100132288304b8e5d4798bbb7929a512e9b57.tar.bz2
Merge
-rw-r--r--Doc/library/datetime.rst2
1 files changed, 0 insertions, 2 deletions
diff --git a/Doc/library/datetime.rst b/Doc/library/datetime.rst
index daec02b..c0cc2f1 100644
--- a/Doc/library/datetime.rst
+++ b/Doc/library/datetime.rst
@@ -912,7 +912,6 @@ Supported operations:
offsets (obtained from ``self.utcoffset()``).
.. versionchanged:: 3.3
-
Equality comparisons between naive and aware :class:`datetime`
instances don't raise :exc:`TypeError`.
@@ -1343,7 +1342,6 @@ Supported operations:
``!=``. The latter cases return :const:`False` or :const:`True`, respectively.
.. versionchanged:: 3.3
-
Equality comparisons between naive and aware :class:`time` instances
don't raise :exc:`TypeError`.