comparison Python/sysmodule.c @ 59300:29fac4b1a51e

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:54:54 +0000
parents 7379cf70fd60
children 86fadaebcf66
comparison
equal deleted inserted replaced
59296:bd9c7993ee75 59300:29fac4b1a51e
105 } 105 }
106 106
107 PyDoc_STRVAR(displayhook_doc, 107 PyDoc_STRVAR(displayhook_doc,
108 "displayhook(object) -> None\n" 108 "displayhook(object) -> None\n"
109 "\n" 109 "\n"
110 "Print an object to sys.stdout and also save it in builtins.\n" 110 "Print an object to sys.stdout and also save it in builtins._\n"
111 ); 111 );
112 112
113 static PyObject * 113 static PyObject *
114 sys_excepthook(PyObject* self, PyObject* args) 114 sys_excepthook(PyObject* self, PyObject* args)
115 { 115 {