[Python-checkins] closes bpo-39870: Remove unused arg from sys_displayhook_unencodable. (GH-18796)
Andy Lester
webhook-mailer at python.org
Thu Mar 5 23:34:43 EST 2020
https://github.com/python/cpython/commit/da4d656e951b00580d135ae6345656ecedf9d8d4
commit: da4d656e951b00580d135ae6345656ecedf9d8d4
branch: master
author: Andy Lester <andy at petdance.com>
committer: GitHub <noreply at github.com>
date: 2020-03-05T20:34:36-08:00
summary:
closes bpo-39870: Remove unused arg from sys_displayhook_unencodable. (GH-18796)
Also move int err to its innermost scope.
files:
M Python/sysmodule.c
diff --git a/Python/sysmodule.c b/Python/sysmodule.c
index cacff529758c6..bfacf314dfc9e 100644
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -551,7 +551,7 @@ PyDoc_STRVAR(breakpointhook_doc,
Helper function for sys_displayhook(). */
static int
-sys_displayhook_unencodable(PyThreadState *tstate, PyObject *outf, PyObject *o)
+sys_displayhook_unencodable(PyObject *outf, PyObject *o)
{
PyObject *stdout_encoding = NULL;
PyObject *encoded, *escaped_str, *repr_str, *buffer, *result;
@@ -624,7 +624,6 @@ sys_displayhook(PyObject *module, PyObject *o)
PyObject *outf;
PyObject *builtins;
static PyObject *newline = NULL;
- int err;
PyThreadState *tstate = _PyThreadState_GET();
builtins = _PyImport_GetModuleId(&PyId_builtins);
@@ -652,10 +651,11 @@ sys_displayhook(PyObject *module, PyObject *o)
}
if (PyFile_WriteObject(o, outf, 0) != 0) {
if (_PyErr_ExceptionMatches(tstate, PyExc_UnicodeEncodeError)) {
+ int err;
/* repr(o) is not encodable to sys.stdout.encoding with
* sys.stdout.errors error handler (which is probably 'strict') */
_PyErr_Clear(tstate);
- err = sys_displayhook_unencodable(tstate, outf, o);
+ err = sys_displayhook_unencodable(outf, o);
if (err) {
return NULL;
}
More information about the Python-checkins
mailing list