Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Get rid of more uses of string and use unicode

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
Show Stats 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); self = (Noddy *)type->tp_alloc(type, 0);
if (self != NULL) { if (self != NULL) {
self->first = PyString_FromString(""); self->first = PyUnicode_FromString("");
if (self->first == NULL) if (self->first == NULL)
{ {
Py_DECREF(self); Py_DECREF(self);
return NULL; return NULL;
} }
self->last = PyString_FromString(""); self->last = PyUnicode_FromString("");
if (self->last == NULL) if (self->last == NULL)
{ {
Py_DECREF(self); Py_DECREF(self);
@ -90,7 +90,7 @@ Noddy_name(Noddy* self)
PyObject *args, *result; PyObject *args, *result;
if (format == NULL) { if (format == NULL) {
format = PyString_FromString("%s %s"); format = PyUnicode_FromString("%s %s");
if (format == NULL) if (format == NULL)
return NULL; return NULL;
} }
@ -109,7 +109,7 @@ Noddy_name(Noddy* self)
if (args == NULL) if (args == NULL)
return NULL; return NULL;
result = PyString_Format(format, args); result = PyUnicode_Format(format, args);
Py_DECREF(args); Py_DECREF(args);
return result; 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); self = (Noddy *)type->tp_alloc(type, 0);
if (self != NULL) { if (self != NULL) {
self->first = PyString_FromString(""); self->first = PyUnicode_FromString("");
if (self->first == NULL) if (self->first == NULL)
{ {
Py_DECREF(self); Py_DECREF(self);
return NULL; return NULL;
} }
self->last = PyString_FromString(""); self->last = PyUnicode_FromString("");
if (self->last == NULL) if (self->last == NULL)
{ {
Py_DECREF(self); Py_DECREF(self);
@ -93,7 +93,7 @@ Noddy_setfirst(Noddy *self, PyObject *value, void *closure)
return -1; return -1;
} }
if (! PyString_Check(value)) { if (! PyUnicode_Check(value)) {
PyErr_SetString(PyExc_TypeError, PyErr_SetString(PyExc_TypeError,
"The first attribute value must be a string"); "The first attribute value must be a string");
return -1; return -1;
@ -121,7 +121,7 @@ Noddy_setlast(Noddy *self, PyObject *value, void *closure)
return -1; return -1;
} }
if (! PyString_Check(value)) { if (! PyUnicode_Check(value)) {
PyErr_SetString(PyExc_TypeError, PyErr_SetString(PyExc_TypeError,
"The last attribute value must be a string"); "The last attribute value must be a string");
return -1; return -1;
@ -153,7 +153,7 @@ Noddy_name(Noddy* self)
PyObject *args, *result; PyObject *args, *result;
if (format == NULL) { if (format == NULL) {
format = PyString_FromString("%s %s"); format = PyUnicode_FromString("%s %s");
if (format == NULL) if (format == NULL)
return NULL; return NULL;
} }
@ -162,7 +162,7 @@ Noddy_name(Noddy* self)
if (args == NULL) if (args == NULL)
return NULL; return NULL;
result = PyString_Format(format, args); result = PyUnicode_Format(format, args);
Py_DECREF(args); Py_DECREF(args);
return result; 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); self = (Noddy *)type->tp_alloc(type, 0);
if (self != NULL) { if (self != NULL) {
self->first = PyString_FromString(""); self->first = PyUnicode_FromString("");
if (self->first == NULL) if (self->first == NULL)
{ {
Py_DECREF(self); Py_DECREF(self);
return NULL; return NULL;
} }
self->last = PyString_FromString(""); self->last = PyUnicode_FromString("");
if (self->last == NULL) if (self->last == NULL)
{ {
Py_DECREF(self); Py_DECREF(self);
@ -124,7 +124,7 @@ Noddy_name(Noddy* self)
PyObject *args, *result; PyObject *args, *result;
if (format == NULL) { if (format == NULL) {
format = PyString_FromString("%s %s"); format = PyUnicode_FromString("%s %s");
if (format == NULL) if (format == NULL)
return NULL; return NULL;
} }
@ -143,7 +143,7 @@ Noddy_name(Noddy* self)
if (args == NULL) if (args == NULL)
return NULL; return NULL;
result = PyString_Format(format, args); result = PyUnicode_Format(format, args);
Py_DECREF(args); Py_DECREF(args);
return result; return result;

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

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

5
Modules/_lsprof.c
View File

@ -179,10 +179,7 @@ normalizeUserObj(PyObject *obj)
/* built-in function: look up the module name */ /* built-in function: look up the module name */
PyObject *mod = fn->m_module; PyObject *mod = fn->m_module;
const char *modname; const char *modname;
if (mod && PyString_Check(mod)) { if (mod && PyUnicode_Check(mod)) {
modname = PyString_AS_STRING(mod);
}
else if (mod && PyUnicode_Check(mod)) {
modname = PyUnicode_AsString(mod); modname = PyUnicode_AsString(mod);
} }
else if (mod && PyModule_Check(mod)) { else if (mod && PyModule_Check(mod)) {

2
Objects/exceptions.c
View File

@ -1882,7 +1882,7 @@ _PyExc_Init(void)
(PyBaseExceptionObject *)PyExc_RecursionErrorInst; (PyBaseExceptionObject *)PyExc_RecursionErrorInst;
PyObject *args_tuple; PyObject *args_tuple;
PyObject *exc_message; PyObject *exc_message;
exc_message = PyString_FromString("maximum recursion depth exceeded"); exc_message = PyUnicode_FromString("maximum recursion depth exceeded");
if (!exc_message) if (!exc_message)
Py_FatalError("cannot allocate argument for RuntimeError " Py_FatalError("cannot allocate argument for RuntimeError "
"pre-allocation"); "pre-allocation");

2
Objects/frameobject.c
View File

@ -721,7 +721,7 @@ map_to_dict(PyObject *map, Py_ssize_t nmap, PyObject *dict, PyObject **values,
for (j = nmap; --j >= 0; ) { for (j = nmap; --j >= 0; ) {
PyObject *key = PyTuple_GET_ITEM(map, j); PyObject *key = PyTuple_GET_ITEM(map, j);
PyObject *value = values[j]; PyObject *value = values[j];
assert(PyString_Check(key)/*XXX this should go*/ || PyUnicode_Check(key)); assert(PyUnicode_Check(key));
if (deref) { if (deref) {
assert(PyCell_Check(value)); assert(PyCell_Check(value));
value = PyCell_GET(value); value = PyCell_GET(value);