[Python-checkins] cpython-gd (merge 3.2 -> default): merge from 3.2
local-hg
python-checkins at python.org
Mon Jul 4 20:51:18 CEST 2011
http://hg.python.org/cpython-gd/rev/f9d30fac3da0
changeset: 71211:f9d30fac3da0
parent: 71209:283f20f1d31f
parent: 71210:184192b3687c
user: Senthil Kumaran <senthil at uthcode.com>
date: Mon Jul 04 11:44:17 2011 -0700
files: Doc/library/datetime.rst Doc/library/os.rst
description:
merge from 3.2
summary:
merge from 3.2
files:
Doc/library/datetime.rst | 2 +-
Doc/library/os.rst | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Doc/library/datetime.rst b/Doc/library/datetime.rst
--- a/Doc/library/datetime.rst
+++ b/Doc/library/datetime.rst
@@ -1267,7 +1267,7 @@
subtracting their UTC offsets (obtained from ``self.utcoffset()``). In order
to stop mixed-type comparisons from falling back to the default comparison by
object address, when a :class:`time` object is compared to an object of a
- different type, :exc:`TypeError` is raised unless the comparison is ``==`` or
+ different type, :exc:`TypeError` is raised unless the comparison is ``==`` or
``!=``. The latter cases return :const:`False` or :const:`True`, respectively.
* hash, use as dict key
diff --git a/Doc/library/os.rst b/Doc/library/os.rst
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -1826,7 +1826,7 @@
.. note::
- The exact meaning and resolution of the :attr:`st_atime`,
+ The exact meaning and resolution of the :attr:`st_atime`,
:attr:`st_mtime`, and :attr:`st_ctime` attributes depend on the operating
system and the file system. For example, on Windows systems using the FAT
or FAT32 file systems, :attr:`st_mtime` has 2-second resolution, and
--
Repository URL: http://hg.python.org/cpython-gd
More information about the Python-checkins
mailing list