Mercurial > cpython-lru_cache-weakref
diff RISCOS/Modules/drawfmodule.c @ 47527:52294af4b663 legacy-trunk
This reverts r63675 based on the discussion in this thread:
http://mail.python.org/pipermail/python-dev/2008-June/079988.html
Python 2.6 should stick with PyString_* in its codebase. The PyBytes_* names
in the spirit of 3.0 are available via a #define only. See the email thread.
| author | Gregory P. Smith <greg@mad-scientist.com> |
|---|---|
| date | Mon, 09 Jun 2008 04:58:54 +0000 |
| parents | 4fe192d48960 |
| children |
line wrap: on
line diff
--- a/RISCOS/Modules/drawfmodule.c Mon Jun 09 01:28:30 2008 +0000 +++ b/RISCOS/Modules/drawfmodule.c Mon Jun 09 04:58:54 2008 +0000 @@ -333,7 +333,7 @@ char *dtable; if(!PyArg_ParseTuple(arg,"O!",&PyDict_Type,&d)) return NULL; while(PyDict_Next(d,&n,&key,&value)) - { int m=PyBytes_Size(value); + { int m=PyString_Size(value); if(m<0||!PyInt_Check(key)) return NULL; size+=m+2; } @@ -350,9 +350,9 @@ memset(dtable,0,size-8); n=0; while(PyDict_Next(d,&n,&key,&value)) - { int m=PyBytes_Size(value); + { int m=PyString_Size(value); *dtable=(char)PyInt_AsLong(key); - strcpy(dtable+1,PyBytes_AsString(value)); + strcpy(dtable+1,PyString_AsString(value)); dtable+=m+2; } Py_INCREF(Py_None);return Py_None; @@ -609,8 +609,8 @@ if (!strcmp(name, "__members__")) { PyObject *list = PyList_New(2); if (list) - { PyList_SetItem(list, 0, PyBytes_FromString("size")); - PyList_SetItem(list, 1, PyBytes_FromString("start")); + { PyList_SetItem(list, 0, PyString_FromString("size")); + PyList_SetItem(list, 1, PyString_FromString("start")); if (PyErr_Occurred()) { Py_DECREF(list);list = NULL;} } return list; @@ -659,6 +659,6 @@ { PyObject *m, *d; m = Py_InitModule("drawf", DrawFMethods); d = PyModule_GetDict(m); - DrawFError=PyBytes_FromString("drawf.error"); + DrawFError=PyString_FromString("drawf.error"); PyDict_SetItemString(d,"error",DrawFError); }