From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 4 May 2008 23:22:13 +0000 (+0000)
Subject: Fix merge error
X-Git-Tag: v3.0a5~32
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9f4bf1dcd141aac75ca0ae32d97c45248d685866;p=thirdparty%2FPython%2Fcpython.git

Fix merge error
---

diff --git a/Python/_warnings.c b/Python/_warnings.c
index 956b3f5d4f06..c84bd85ebb61 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;
                 }