From: Florent Xicluna <florent.xicluna@gmail.com>
Date: Wed, 3 Mar 2010 11:54:54 +0000 (+0000)
Subject: Merged revisions 78620 via svnmerge from
X-Git-Tag: v3.2a1~1582
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5749e85b53618d9e8c0fa5ee2f4f796b0a4ca6e2;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 78620 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78620 | florent.xicluna | 2010-03-03 12:49:53 +0100 (mer, 03 mar 2010) | 2 lines

  Revert a nonexistent docstring typo, r42805.
........
---

diff --git a/Python/sysmodule.c b/Python/sysmodule.c
index f1cbbba48b7e..490577d3e264 100644
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -107,7 +107,7 @@ sys_displayhook(PyObject *self, PyObject *o)
 PyDoc_STRVAR(displayhook_doc,
 "displayhook(object) -> None\n"
 "\n"
-"Print an object to sys.stdout and also save it in builtins.\n"
+"Print an object to sys.stdout and also save it in builtins._\n"
 );
 
 static PyObject *