diff options
| author | Alexander Belopolsky <alexander.belopolsky@gmail.com> | 2010-07-03 03:35:27 (GMT) |
|---|---|---|
| committer | Alexander Belopolsky <alexander.belopolsky@gmail.com> | 2010-07-03 03:35:27 (GMT) |
| commit | 2f194b906027db630e731021429746eb214b0a7a (patch) | |
| tree | 81a2a0a5d90034ccf2f75aa597ef000c23813460 /Modules/datetimemodule.c | |
| parent | 2cab50b9378731cb64ecb5aa21f72a36e0a7bde3 (diff) | |
| download | cpython-2f194b906027db630e731021429746eb214b0a7a.zip cpython-2f194b906027db630e731021429746eb214b0a7a.tar.gz cpython-2f194b906027db630e731021429746eb214b0a7a.tar.bz2 | |
Merged revisions 82466 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r82466 | alexander.belopolsky | 2010-07-02 23:27:12 -0400 (Fri, 02 Jul 2010) | 1 line
Revert r81681 (issue 8810).
........
Diffstat (limited to 'Modules/datetimemodule.c')
| -rw-r--r-- | Modules/datetimemodule.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Modules/datetimemodule.c b/Modules/datetimemodule.c index ce94a1e..a252ee1 100644 --- a/Modules/datetimemodule.c +++ b/Modules/datetimemodule.c @@ -3277,8 +3277,7 @@ static PyMethodDef tzinfo_methods[] = { PyDoc_STR("datetime -> DST offset in minutes east of UTC.")}, {"fromutc", (PyCFunction)tzinfo_fromutc, METH_O, - PyDoc_STR("datetime -> timedelta showing offset from UTC, negative " - "values indicating West of UTC")}, + PyDoc_STR("datetime in UTC -> datetime in local time.")}, {"__reduce__", (PyCFunction)tzinfo_reduce, METH_NOARGS, PyDoc_STR("-> (cls, state)")}, |