]> granicus.if.org Git - python/commitdiff
Fix merge error
authorBenjamin Peterson <benjamin@python.org>
Sun, 4 May 2008 23:22:13 +0000 (23:22 +0000)
committerBenjamin Peterson <benjamin@python.org>
Sun, 4 May 2008 23:22:13 +0000 (23:22 +0000)
Python/_warnings.c

index 956b3f5d4f06ad919459cec4f037db56c33cb65b..c84bd85ebb61f85c8edc6dd0574a66580a0acc8c 100644 (file)
@@ -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;
                 }