mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-07 15:42:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 18

Fix merge error

Browse source
This commit is contained in:
Benjamin Peterson 2008-05-04 23:22:13 +00:00
parent 81ee3efede
commit 9f4bf1dcd1
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Python/_warnings.c
View file

@ -498,7 +498,7 @@ setup_context(Py_ssize_t stack_level, PyObject **filename, int *lineno,
} }
else if (!is_true) { else if (!is_true) {
Py_DECREF(*filename); Py_DECREF(*filename);
*filename = PyString_FromString("__main__"); *filename = PyUnicode_FromString("__main__");
if (*filename == NULL) if (*filename == NULL)
goto handle_error; goto handle_error;
} }