comparison Python/sysmodule.c @ 59299:687d8517a0c3 2.6

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. ........
author Florent Xicluna <florent.xicluna@gmail.com>
date Wed, 03 Mar 2010 11:50:46 +0000
parents 75bb2f1691c0
children 5bb295a94b0f
comparison
equal deleted inserted replaced
59297:bff050450283 59299:687d8517a0c3
124 } 124 }
125 125
126 PyDoc_STRVAR(displayhook_doc, 126 PyDoc_STRVAR(displayhook_doc,
127 "displayhook(object) -> None\n" 127 "displayhook(object) -> None\n"
128 "\n" 128 "\n"
129 "Print an object to sys.stdout and also save it in __builtin__.\n" 129 "Print an object to sys.stdout and also save it in __builtin__._\n"
130 ); 130 );
131 131
132 static PyObject * 132 static PyObject *
133 sys_excepthook(PyObject* self, PyObject* args) 133 sys_excepthook(PyObject* self, PyObject* args)
134 { 134 {