summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Belopolsky <alexander.belopolsky@gmail.com>2010-06-09 17:11:01 (GMT)
committerAlexander Belopolsky <alexander.belopolsky@gmail.com>2010-06-09 17:11:01 (GMT)
commitda62f2fe28c090f4c9cd4e611d842478faa8d22a (patch)
treef18a120170df9302db47e42406006f28fe6d8c61
parentd118856049e514dd413112ee6e2d03713c68df9d (diff)
downloadcpython-da62f2fe28c090f4c9cd4e611d842478faa8d22a.zip
cpython-da62f2fe28c090f4c9cd4e611d842478faa8d22a.tar.gz
cpython-da62f2fe28c090f4c9cd4e611d842478faa8d22a.tar.bz2
Merged revisions 81864 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r81864 | alexander.belopolsky | 2010-06-09 13:08:11 -0400 (Wed, 09 Jun 2010) | 1 line Fixed markup of tm_isdst attribute. ........
-rw-r--r--Doc/library/datetime.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/datetime.rst b/Doc/library/datetime.rst
index 2498361..00569a8 100644
--- a/Doc/library/datetime.rst
+++ b/Doc/library/datetime.rst
@@ -952,7 +952,7 @@ Instance methods:
of the result is set according to the :meth:`dst` method: :attr:`tzinfo` is
``None`` or :meth:`dst`` returns ``None``, :attr:`tm_isdst` is set to ``-1``;
else if :meth:`dst` returns a non-zero value, :attr:`tm_isdst` is set to ``1``;
- else ``tm_isdst`` is set to ``0``.
+ else :attr:`tm_isdst` is set to ``0``.
.. method:: datetime.utctimetuple()