commit 9f4bf1dcd141aac75ca0ae32d97c45248d685866
author Benjamin Peterson <benjamin@python.org> Sun May 04 23:22:13 2008 +0000
committer Benjamin Peterson <benjamin@python.org> Sun May 04 23:22:13 2008 +0000
tree 9bb090f75e156ed3e47efbbd6718500122278c36
parent 81ee3efededdaba0a7c0b1a3aac07727cebb6fc1

Fix merge error

Python/_warnings.c

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 @@
                 }
                 else if (!is_true) {
                     Py_DECREF(*filename);
-                    *filename = PyString_FromString("__main__");
+                    *filename = PyUnicode_FromString("__main__");
                     if (*filename == NULL)
                         goto handle_error;
                 }