Convert a bunch of constant strings in C to unicode.

diff --git a/Modules/_curses_panel.c b/Modules/_curses_panel.c
index 5eb4cf8ff7e793d4edf8e48bf206fafd6d5ba43d..e73d9865bd23c94b0086c41f1eca231d62eb90c3 100644 (file)
--- a/Modules/_curses_panel.c
+++ b/Modules/_curses_panel.c
@@ -472,7 +472,7 @@ init_curses_panel(void)
     PyDict_SetItemString(d, "error", PyCursesError);
 
     /* Make the version available */
-    v = PyString_FromString(PyCursesVersion);
+    v = PyUnicode_FromString(PyCursesVersion);
     PyDict_SetItemString(d, "version", v);
     PyDict_SetItemString(d, "__version__", v);
     Py_DECREF(v);

diff --git a/Modules/bz2module.c b/Modules/bz2module.c
index c913c3fece13b18e7d818bf42bfbf60de7b13c2d..65e3ae753ede1fed1e60947dd5ab2b9b15d37bd8 100644 (file)
--- a/Modules/bz2module.c
+++ b/Modules/bz2module.c
@@ -2048,7 +2048,7 @@ initbz2(void)
        if (m == NULL)
                return;
 
-       PyModule_AddObject(m, "__author__", PyString_FromString(__author__));
+       PyModule_AddObject(m, "__author__", PyUnicode_FromString(__author__));
 
        Py_INCREF(&BZ2File_Type);
        PyModule_AddObject(m, "BZ2File", (PyObject *)&BZ2File_Type);

diff --git a/Modules/gcmodule.c b/Modules/gcmodule.c
index 59607302f4d51ddd40f4504a957258f1425886e3..63fb1f1eac0df6537860868d88b9dac9f0595b4e 100644 (file)
--- a/Modules/gcmodule.c
+++ b/Modules/gcmodule.c
@@ -851,7 +851,7 @@ collect(int generation)
 
        if (PyErr_Occurred()) {
                if (gc_str == NULL)
-                       gc_str = PyString_FromString("garbage collection");
+                       gc_str = PyUnicode_FromString("garbage collection");
                PyErr_WriteUnraisable(gc_str);
                Py_FatalError("unexpected exception during garbage collection");
        }

diff --git a/Modules/zlibmodule.c b/Modules/zlibmodule.c
index badc090d9177237be632077a9da19d3905907070..fd6c0b790c92995b9bbaaebef6f29ac69d0aae6b 100644 (file)
--- a/Modules/zlibmodule.c
+++ b/Modules/zlibmodule.c
@@ -1039,7 +1039,7 @@ PyInit_zlib(void)
     PyModule_AddIntConstant(m, "Z_SYNC_FLUSH", Z_SYNC_FLUSH);
     PyModule_AddIntConstant(m, "Z_FULL_FLUSH", Z_FULL_FLUSH);
 
-    ver = PyString_FromString(ZLIB_VERSION);
+    ver = PyUnicode_FromString(ZLIB_VERSION);
     if (ver != NULL)
        PyModule_AddObject(m, "ZLIB_VERSION", ver);
 

diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index 1ae38d5e495f4c1d5b204531bde3fe602e41b891..a483b6cb4d8e1511f798d1838254a061f8d99b80 100644 (file)
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -194,7 +194,7 @@ PyDict_New(void)
 {
        register dictobject *mp;
        if (dummy == NULL) { /* Auto-initialize dummy */
-               dummy = PyString_FromString("<dummy key>");
+               dummy = PyUnicode_FromString("<dummy key>");
                if (dummy == NULL)
                        return NULL;
 #ifdef SHOW_CONVERSION_COUNTS

diff --git a/Objects/listobject.c b/Objects/listobject.c
index 7e2483e7fd6a044a7ee748bd93c37ed698632780..50d9d9b76d2773abf0ce9ed0ee780fc9df96a6be 100644 (file)
--- a/Objects/listobject.c
+++ b/Objects/listobject.c
@@ -142,7 +142,7 @@ PyList_GetItem(PyObject *op, Py_ssize_t i)
        }
        if (i < 0 || i >= Py_Size(op)) {
                if (indexerr == NULL)
-                       indexerr = PyString_FromString(
+                       indexerr = PyUnicode_FromString(
                                "list index out of range");
                PyErr_SetObject(PyExc_IndexError, indexerr);
                return NULL;
@@ -362,7 +362,7 @@ list_item(PyListObject *a, Py_ssize_t i)
 {
        if (i < 0 || i >= Py_Size(a)) {
                if (indexerr == NULL)
-                       indexerr = PyString_FromString(
+                       indexerr = PyUnicode_FromString(
                                "list index out of range");
                PyErr_SetObject(PyExc_IndexError, indexerr);
                return NULL;

diff --git a/Objects/setobject.c b/Objects/setobject.c
index 2cc1743167badf7289b73f23176c29779c24a9cf..7ff27b1f70457ce949f435ca0a41c790293eb5fd 100644 (file)
--- a/Objects/setobject.c
+++ b/Objects/setobject.c
@@ -966,7 +966,7 @@ make_new_set(PyTypeObject *type, PyObject *iterable)
        register PySetObject *so = NULL;
 
        if (dummy == NULL) { /* Auto-initialize dummy */
-               dummy = PyString_FromString("<dummy key>");
+               dummy = PyUnicode_FromString("<dummy key>");
                if (dummy == NULL)
                        return NULL;
        }