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

Fix compilation warnings seen on Windows.

Browse source 
'typecode' is always an ascii letter, there was no data lost.
This commit is contained in:
Amaury Forgeot d'Arc 2010-11-25 08:13:35 +00:00
parent 5fa40c01ad
commit 24aa26b05e
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Modules/arraymodule.c
View file

@ -1448,7 +1448,7 @@ array_fromunicode(arrayobject *self, PyObject *args)
{ {
Py_UNICODE *ustr; Py_UNICODE *ustr;
Py_ssize_t n; Py_ssize_t n;
char typecode; Py_UNICODE typecode;
if (!PyArg_ParseTuple(args, "u#:fromunicode", &ustr, &n)) if (!PyArg_ParseTuple(args, "u#:fromunicode", &ustr, &n))
return NULL; return NULL;
@ -1483,7 +1483,7 @@ append Unicode data to an array of some other type.");
static PyObject * static PyObject *
array_tounicode(arrayobject *self, PyObject *unused) array_tounicode(arrayobject *self, PyObject *unused)
{ {
char typecode; Py_UNICODE typecode;
typecode = self->ob_descr->typecode; typecode = self->ob_descr->typecode;
if ((typecode != 'u')) { if ((typecode != 'u')) {
PyErr_SetString(PyExc_ValueError, PyErr_SetString(PyExc_ValueError,
@ -2002,8 +2002,8 @@ PyDoc_STRVAR(reduce_doc, "Return state information for pickling.");
static PyObject * static PyObject *
array_get_typecode(arrayobject *a, void *closure) array_get_typecode(arrayobject *a, void *closure)
{ {
char tc = a->ob_descr->typecode; Py_UNICODE tc = a->ob_descr->typecode;
return PyUnicode_FromStringAndSize(&tc, 1); return PyUnicode_FromUnicode(&tc, 1);
} }
static PyObject * static PyObject *
@ -2075,21 +2075,21 @@ static PyMethodDef array_methods[] = {
static PyObject * static PyObject *
array_repr(arrayobject *a) array_repr(arrayobject *a)
{ {
char typecode; Py_UNICODE typecode;
PyObject *s, *v = NULL; PyObject *s, *v = NULL;
Py_ssize_t len; Py_ssize_t len;
len = Py_SIZE(a); len = Py_SIZE(a);
typecode = a->ob_descr->typecode; typecode = a->ob_descr->typecode;
if (len == 0) { if (len == 0) {
return PyUnicode_FromFormat("array('%c')", typecode); return PyUnicode_FromFormat("array('%c')", (int)typecode);
} }
if ((typecode == 'u')) if ((typecode == 'u'))
v = array_tounicode(a, NULL); v = array_tounicode(a, NULL);
else else
v = array_tolist(a, NULL); 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); Py_DECREF(v);
return s; return s;
} }