summaryrefslogtreecommitdiffstats
path: root/Python/_warnings.c
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2008-05-04 23:22:13 (GMT)
committerBenjamin Peterson <benjamin@python.org>2008-05-04 23:22:13 (GMT)
commit9f4bf1dcd141aac75ca0ae32d97c45248d685866 (patch)
tree9bb090f75e156ed3e47efbbd6718500122278c36 /Python/_warnings.c
parent81ee3efededdaba0a7c0b1a3aac07727cebb6fc1 (diff)
downloadcpython-9f4bf1dcd141aac75ca0ae32d97c45248d685866.zip
cpython-9f4bf1dcd141aac75ca0ae32d97c45248d685866.tar.gz
cpython-9f4bf1dcd141aac75ca0ae32d97c45248d685866.tar.bz2
Fix merge error
Diffstat (limited to 'Python/_warnings.c')
-rw-r--r--Python/_warnings.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Python/_warnings.c b/Python/_warnings.c
index 956b3f5..c84bd85 100644
--- a/Python/_warnings.c
+++ b/Python/_warnings.c
@@ -498,7 +498,7 @@ setup_context(Py_ssize_t stack_level, PyObject **filename, int *lineno,
}
else if (!is_true) {
Py_DECREF(*filename);
- *filename = PyString_FromString("__main__");
+ *filename = PyUnicode_FromString("__main__");
if (*filename == NULL)
goto handle_error;
}