From 9f4bf1dcd141aac75ca0ae32d97c45248d685866 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Sun, 4 May 2008 23:22:13 +0000 Subject: Fix merge error --- Python/_warnings.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; } -- cgit v0.12