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).
........
This commit is contained in:
Alexander Belopolsky 2010-07-03 03:35:27 +00:00
parent 2cab50b937
commit 2f194b9060
1 changed files with 1 additions and 2 deletions

View File

@ -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)")},