Mercurial > cpython-lru_cache-weakref
comparison Python/sysmodule.c @ 59302:4b413dfa27f9 3.1
Merged revisions 78622 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r78622 | florent.xicluna | 2010-03-03 12:54:54 +0100 (mer, 03 mar 2010) | 9 lines
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:55:53 +0000 |
| parents | 4d38e51e7cdc |
| children | c6b4f4f2b9a8 |
comparison
equal
deleted
inserted
replaced
| 59292:1e4c4b235a89 | 59302:4b413dfa27f9 |
|---|---|
| 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 { |
