diff options
| author | Victor Stinner <vstinner@redhat.com> | 2019-07-01 15:41:38 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-01 15:41:38 (GMT) |
| commit | 8cbffc4d96d1da0fbc38da6f34f2da30c5ffd601 (patch) | |
| tree | 13a4e38a3052f396e19a1d7eec8d9fb75820e217 /Python/pythonrun.c | |
| parent | 45c10da40912e04c0d0de02af4b23438ed0de49b (diff) | |
| download | cpython-8cbffc4d96d1da0fbc38da6f34f2da30c5ffd601.zip cpython-8cbffc4d96d1da0fbc38da6f34f2da30c5ffd601.tar.gz cpython-8cbffc4d96d1da0fbc38da6f34f2da30c5ffd601.tar.bz2 | |
bpo-37467: Fix PyErr_Display() for bytes filename (GH-14504) (GH-14515)
Fix sys.excepthook() and PyErr_Display() if a filename is a bytes
string. For example, for a SyntaxError exception where the filename
attribute is a bytes string.
Cleanup also test_sys:
* Sort imports.
* Rename numruns global var to INTERN_NUMRUNS.
* Add DisplayHookTest and ExceptHookTest test case classes.
* Don't save/restore sys.stdout and sys.displayhook using
setUp()/tearDown(): do it in each test method.
* Test error case (call hook with no argument) after the success case.
(cherry picked from commit f9b7457bd7f438263e0d2dd1f70589ad56a2585e)
Diffstat (limited to 'Python/pythonrun.c')
| -rw-r--r-- | Python/pythonrun.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Python/pythonrun.c b/Python/pythonrun.c index c4ec5ac..4c974ce 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -750,7 +750,7 @@ print_exception(PyObject *f, PyObject *value) Py_DECREF(value); value = message; - line = PyUnicode_FromFormat(" File \"%U\", line %d\n", + line = PyUnicode_FromFormat(" File \"%S\", line %d\n", filename, lineno); Py_DECREF(filename); if (line != NULL) { |