mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 08:34:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Get rid of more uses of string and use unicode

Browse source
This commit is contained in:
Neal Norwitz 2007-10-27 04:00:45 +00:00
parent 841e122f0e
commit bed678449f
7 changed files with 18 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Doc/includes/noddy2.c
View file

@ -23,14 +23,14 @@ Noddy_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
self = (Noddy *)type->tp_alloc(type, 0);
if (self != NULL) {
self->first = PyString_FromString("");
self->first = PyUnicode_FromString("");
if (self->first == NULL)
{
Py_DECREF(self);
return NULL;
}
self->last = PyString_FromString("");
self->last = PyUnicode_FromString("");
if (self->last == NULL)
{
Py_DECREF(self);
@ -90,7 +90,7 @@ Noddy_name(Noddy* self)
PyObject *args, *result;
if (format == NULL) {
format = PyString_FromString("%s %s");
format = PyUnicode_FromString("%s %s");
if (format == NULL)
return NULL;
}
@ -109,7 +109,7 @@ Noddy_name(Noddy* self)
if (args == NULL)
return NULL;
result = PyString_Format(format, args);
result = PyUnicode_Format(format, args);
Py_DECREF(args);
return result;

12
Doc/includes/noddy3.c
View file

@ -23,14 +23,14 @@ Noddy_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
self = (Noddy *)type->tp_alloc(type, 0);
if (self != NULL) {
self->first = PyString_FromString("");
self->first = PyUnicode_FromString("");
if (self->first == NULL)
{
Py_DECREF(self);
return NULL;
}
self->last = PyString_FromString("");
self->last = PyUnicode_FromString("");
if (self->last == NULL)
{
Py_DECREF(self);
@ -93,7 +93,7 @@ Noddy_setfirst(Noddy *self, PyObject *value, void *closure)
return -1;
}
if (! PyString_Check(value)) {
if (! PyUnicode_Check(value)) {
PyErr_SetString(PyExc_TypeError,
"The first attribute value must be a string");
return -1;
@ -121,7 +121,7 @@ Noddy_setlast(Noddy *self, PyObject *value, void *closure)
return -1;
}
if (! PyString_Check(value)) {
if (! PyUnicode_Check(value)) {
PyErr_SetString(PyExc_TypeError,
"The last attribute value must be a string");
return -1;
@ -153,7 +153,7 @@ Noddy_name(Noddy* self)
PyObject *args, *result;
if (format == NULL) {
format = PyString_FromString("%s %s");
format = PyUnicode_FromString("%s %s");
if (format == NULL)
return NULL;
}
@ -162,7 +162,7 @@ Noddy_name(Noddy* self)
if (args == NULL)
return NULL;
result = PyString_Format(format, args);
result = PyUnicode_Format(format, args);
Py_DECREF(args);
return result;

8
Doc/includes/noddy4.c
View file

@ -57,14 +57,14 @@ Noddy_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
self = (Noddy *)type->tp_alloc(type, 0);
if (self != NULL) {
self->first = PyString_FromString("");
self->first = PyUnicode_FromString("");
if (self->first == NULL)
{
Py_DECREF(self);
return NULL;
}
self->last = PyString_FromString("");
self->last = PyUnicode_FromString("");
if (self->last == NULL)
{
Py_DECREF(self);
@ -124,7 +124,7 @@ Noddy_name(Noddy* self)
PyObject *args, *result;
if (format == NULL) {
format = PyString_FromString("%s %s");
format = PyUnicode_FromString("%s %s");
if (format == NULL)
return NULL;
}
@ -143,7 +143,7 @@ Noddy_name(Noddy* self)
if (args == NULL)
return NULL;
result = PyString_Format(format, args);
result = PyUnicode_Format(format, args);
Py_DECREF(args);
return result;

2
Doc/includes/run-func.c
View file

@ -13,7 +13,7 @@ main(int argc, char *argv[])
}
Py_Initialize();
pName = PyString_FromString(argv[1]);
pName = PyUnicode_FromString(argv[1]);
/* Error checking of pName left out */
pModule = PyImport_Import(pName);