python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-03-03 19:45:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

py3k: Remove HAVE_UNICODE from _imagingft

Browse Source 
I'm pretty sure this preserves the intent of the code. HAVE_UNICODE is now
assumed, and PyString is only used if we're not in Py3k.

Since this is the only file that uses PyUnicode, I'm going to go ahead and
#define PyUnicode and PyBytes back to PyString for 2.6, and explicitly
change out every call so I have to check them all.
This commit is contained in:
Brian Crowell 2012-10-13 13:43:54 -05:00 committed by Brian Crowell
parent 804095ecb3
commit d28a2fee76
1 changed files with 13 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
_imagingft.c
View File

@ -40,13 +40,6 @@
#define PyObject_Del PyMem_DEL #define PyObject_Del PyMem_DEL
#endif #endif
#if PY_VERSION_HEX >= 0x01060000
#if PY_VERSION_HEX < 0x02020000 || defined(Py_USING_UNICODE)
/* defining this enables unicode support (default under 1.6a1 and later) */
#define HAVE_UNICODE
#endif
#endif
#if !defined(Py_RETURN_NONE) #if !defined(Py_RETURN_NONE)
#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None #define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
#endif #endif
@ -118,16 +111,10 @@ getfont(PyObject* self_, PyObject* args, PyObject* kw)
"filename", "size", "index", "encoding", NULL "filename", "size", "index", "encoding", NULL
}; };
#if defined(HAVE_UNICODE) && PY_VERSION_HEX >= 0x02020000
if (!PyArg_ParseTupleAndKeywords(args, kw, "eti|is", kwlist, if (!PyArg_ParseTupleAndKeywords(args, kw, "eti|is", kwlist,
Py_FileSystemDefaultEncoding, &filename, Py_FileSystemDefaultEncoding, &filename,
&size, &index, &encoding)) &size, &index, &encoding))
return NULL; return NULL;
#else
if (!PyArg_ParseTupleAndKeywords(args, kw, "si|is", kwlist,
&filename, &size, &index, &encoding))
return NULL;
#endif
if (!library) { if (!library) {
PyErr_SetString( PyErr_SetString(
@ -164,7 +151,6 @@ getfont(PyObject* self_, PyObject* args, PyObject* kw)
static int static int
font_getchar(PyObject* string, int index, FT_ULong* char_out) font_getchar(PyObject* string, int index, FT_ULong* char_out)
{ {
#if defined(HAVE_UNICODE)
if (PyUnicode_Check(string)) { if (PyUnicode_Check(string)) {
Py_UNICODE* p = PyUnicode_AS_UNICODE(string); Py_UNICODE* p = PyUnicode_AS_UNICODE(string);
int size = PyUnicode_GET_SIZE(string); int size = PyUnicode_GET_SIZE(string);
@ -173,7 +159,8 @@ font_getchar(PyObject* string, int index, FT_ULong* char_out)
*char_out = p[index]; *char_out = p[index];
return 1; return 1;
} }
#endif
#if PY_VERSION_HEX < 0x03000000
if (PyString_Check(string)) { if (PyString_Check(string)) {
unsigned char* p = (unsigned char*) PyString_AS_STRING(string); unsigned char* p = (unsigned char*) PyString_AS_STRING(string);
int size = PyString_GET_SIZE(string); int size = PyString_GET_SIZE(string);
@ -182,6 +169,8 @@ font_getchar(PyObject* string, int index, FT_ULong* char_out)
*char_out = (unsigned char) p[index]; *char_out = (unsigned char) p[index];
return 1; return 1;
} }
#endif
return 0; return 0;
} }
@ -201,10 +190,10 @@ font_getsize(FontObject* self, PyObject* args)
if (!PyArg_ParseTuple(args, "O:getsize", &string)) if (!PyArg_ParseTuple(args, "O:getsize", &string))
return NULL; return NULL;
#if defined(HAVE_UNICODE) #if PY_VERSION_HEX >= 0x03000000
if (!PyUnicode_Check(string) && !PyString_Check(string)) { if (!PyUnicode_Check(string)) {
#else #else
if (!PyString_Check(string)) { if (!PyUnicode_Check(string) && !PyString_Check(string)) {
#endif #endif
PyErr_SetString(PyExc_TypeError, "expected string"); PyErr_SetString(PyExc_TypeError, "expected string");
return NULL; return NULL;
@ -267,10 +256,10 @@ font_getabc(FontObject* self, PyObject* args)
if (!PyArg_ParseTuple(args, "O:getabc", &string)) if (!PyArg_ParseTuple(args, "O:getabc", &string))
return NULL; return NULL;
#if defined(HAVE_UNICODE) #if PY_VERSION_HEX >= 0x03000000
if (!PyUnicode_Check(string) && !PyString_Check(string)) { if (!PyUnicode_Check(string)) {
#else #else
if (!PyString_Check(string)) { if (!PyUnicode_Check(string) && !PyString_Check(string)) {
#endif #endif
PyErr_SetString(PyExc_TypeError, "expected string"); PyErr_SetString(PyExc_TypeError, "expected string");
return NULL; return NULL;
@ -315,10 +304,10 @@ font_render(FontObject* self, PyObject* args)
if (!PyArg_ParseTuple(args, "Ol|i:render", &string, &id, &mask)) if (!PyArg_ParseTuple(args, "Ol|i:render", &string, &id, &mask))
return NULL; return NULL;
#if defined(HAVE_UNICODE) #if PY_VERSION_HEX >= 0x03000000
if (!PyUnicode_Check(string) && !PyString_Check(string)) { if (!PyUnicode_Check(string)) {
#else #else
if (!PyString_Check(string)) { if (!PyUnicode_Check(string) && !PyString_Check(string)) {
#endif #endif
PyErr_SetString(PyExc_TypeError, "expected string"); PyErr_SetString(PyExc_TypeError, "expected string");
return NULL; return NULL;