summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorAmaury Forgeot d'Arc <amauryfa@gmail.com>2010-11-25 08:13:35 (GMT)
committerAmaury Forgeot d'Arc <amauryfa@gmail.com>2010-11-25 08:13:35 (GMT)
commit24aa26b05e287cb32c8d011b6e38112cad8eb101 (patch)
treebfa442840d2bbed56357e542f5f83c8bb7f7b058 /Modules
parent5fa40c01ad6144ea2dac37e48860334b590806fc (diff)
downloadcpython-24aa26b05e287cb32c8d011b6e38112cad8eb101.zip
cpython-24aa26b05e287cb32c8d011b6e38112cad8eb101.tar.gz
cpython-24aa26b05e287cb32c8d011b6e38112cad8eb101.tar.bz2
Fix compilation warnings seen on Windows.
'typecode' is always an ascii letter, there was no data lost.
Diffstat (limited to 'Modules')
-rw-r--r--Modules/arraymodule.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c
index a4ce80d..024109a 100644
--- a/Modules/arraymodule.c
+++ b/Modules/arraymodule.c
@@ -1448,7 +1448,7 @@ array_fromunicode(arrayobject *self, PyObject *args)
{
Py_UNICODE *ustr;
Py_ssize_t n;
- char typecode;
+ Py_UNICODE typecode;
if (!PyArg_ParseTuple(args, "u#:fromunicode", &ustr, &n))
return NULL;
@@ -1483,7 +1483,7 @@ append Unicode data to an array of some other type.");
static PyObject *
array_tounicode(arrayobject *self, PyObject *unused)
{
- char typecode;
+ Py_UNICODE typecode;
typecode = self->ob_descr->typecode;
if ((typecode != 'u')) {
PyErr_SetString(PyExc_ValueError,
@@ -2002,8 +2002,8 @@ PyDoc_STRVAR(reduce_doc, "Return state information for pickling.");
static PyObject *
array_get_typecode(arrayobject *a, void *closure)
{
- char tc = a->ob_descr->typecode;
- return PyUnicode_FromStringAndSize(&tc, 1);
+ Py_UNICODE tc = a->ob_descr->typecode;
+ return PyUnicode_FromUnicode(&tc, 1);
}
static PyObject *
@@ -2075,21 +2075,21 @@ static PyMethodDef array_methods[] = {
static PyObject *
array_repr(arrayobject *a)
{
- char typecode;
+ Py_UNICODE typecode;
PyObject *s, *v = NULL;
Py_ssize_t len;
len = Py_SIZE(a);
typecode = a->ob_descr->typecode;
if (len == 0) {
- return PyUnicode_FromFormat("array('%c')", typecode);
+ return PyUnicode_FromFormat("array('%c')", (int)typecode);
}
if ((typecode == 'u'))
v = array_tounicode(a, NULL);
else
v = array_tolist(a, NULL);
- s = PyUnicode_FromFormat("array('%c', %R)", typecode, v);
+ s = PyUnicode_FromFormat("array('%c', %R)", (int)typecode, v);
Py_DECREF(v);
return s;
}