[Python-checkins] r82467 - in python/branches/py3k: Modules/datetimemodule.c

[alexander.belopolsky]

Author: alexander.belopolsky
Date: Sat Jul  3 05:35:27 2010
New Revision: 82467

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


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Modules/datetimemodule.c

Modified: python/branches/py3k/Modules/datetimemodule.c
==============================================================================
--- python/branches/py3k/Modules/datetimemodule.c	(original)
+++ python/branches/py3k/Modules/datetimemodule.c	Sat Jul  3 05:35:27 2010
@@ -3277,8 +3277,7 @@
      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)")},