Rooba
/
cpython
mirror of https://github.com/python/cpython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ord: provide better error messages

This commit is contained in:
Jeremy Hylton 2000-04-12 21:19:47 +00:00
parent 502d2b4615
commit 394b54d01a
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Python/bltinmodule.c
View File

@ -1642,21 +1642,32 @@ builtin_ord(self, args)
{
PyObject *obj;
long ord;
int size;
if (!PyArg_ParseTuple(args, "O:ord", &obj))
return NULL;
if (PyString_Check(obj) && PyString_GET_SIZE(obj) == 1)
ord = (long)((unsigned char)*PyString_AS_STRING(obj));
else if (PyUnicode_Check(obj) && PyUnicode_GET_SIZE(obj) == 1)
ord = (long)*PyUnicode_AS_UNICODE(obj);
else {
PyErr_SetString(PyExc_TypeError,
"expected a string or unicode character");
if (PyString_Check(obj)) {
size = PyString_GET_SIZE(obj);
if (size == 1)
ord = (long)((unsigned char)*PyString_AS_STRING(obj));
} else if (PyUnicode_Check(obj)) {
size = PyUnicode_GET_SIZE(obj);
if (size == 1)
ord = (long)*PyUnicode_AS_UNICODE(obj);
} else {
PyErr_Format(PyExc_TypeError,
"expected string or unicode character, " \
"%.200s found", obj->ob_type->tp_name);
return NULL;
}
if (size == 1)
return PyInt_FromLong(ord);
return PyInt_FromLong(ord);
PyErr_Format(PyExc_TypeError,
"expected a character, length-%d string found",
size);
return NULL;
}
static char ord_doc[] =