summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorNeal Norwitz <nnorwitz@gmail.com>2007-08-23 21:42:55 (GMT)
committerNeal Norwitz <nnorwitz@gmail.com>2007-08-23 21:42:55 (GMT)
commit53cbdaa84c9e3c5f8b7ff2446452ff4d6f536219 (patch)
tree40d00a2f819472aa21bd32b505a53c394019db82 /Modules
parentd6d2f2f93919d035929ac9d02244657a9b604413 (diff)
downloadcpython-53cbdaa84c9e3c5f8b7ff2446452ff4d6f536219.zip
cpython-53cbdaa84c9e3c5f8b7ff2446452ff4d6f536219.tar.gz
cpython-53cbdaa84c9e3c5f8b7ff2446452ff4d6f536219.tar.bz2
Convert a bunch of constant strings in C to unicode.
Diffstat (limited to 'Modules')
-rw-r--r--Modules/_curses_panel.c2
-rw-r--r--Modules/bz2module.c2
-rw-r--r--Modules/gcmodule.c2
-rw-r--r--Modules/zlibmodule.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/Modules/_curses_panel.c b/Modules/_curses_panel.c
index 5eb4cf8..e73d986 100644
--- 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 c913c3f..65e3ae7 100644
--- 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 5960730..63fb1f1 100644
--- 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 badc090..fd6c0b7 100644
--- 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);