From 2f194b906027db630e731021429746eb214b0a7a Mon Sep 17 00:00:00 2001 From: Alexander Belopolsky Date: Sat, 3 Jul 2010 03:35:27 +0000 Subject: 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). ........ --- Modules/datetimemodule.c | 3 +-- 1 file changed, 1 insertion(+), 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)")}, -- cgit v0.12