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).
........

diff --git a/Modules/datetimemodule.c b/Modules/datetimemodule.c
index ce94a1eef993fc566d7b6287dbb25a7d9ea7d829..a252ee1d56f09292a8946e463c42143243c18888 100644 (file)
--- 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)")},