mirror of
https://github.com/python-pillow/Pillow.git
synced 2024-09-21 11:28:58 +03:00
af5228896a
This commit: * Adds Python 3 module initialization functions. I split out the main init of each module into a static setup_module function. * Adds a py3.h which unifies int/long in Python 3 and unicode/bytes in Python 2. _imagingft.c unfortunately looks a little kludgy after this because it was already using PyUnicode functions, and I had to mix and match there manually. With this commit, the modules all build successfully under Python 3. What this commit does NOT do is patch all of the uses of PyArg_ParseTuple and Py_BuildValue, which all need to be checked for proper use of bytes and unicode codes. It also does not let selftest.py run yet, because there are probably hundreds of issues to fix in the Python code itself.
87 lines
1.8 KiB
C
87 lines
1.8 KiB
C
/*
|
|
* The Python Imaging Library.
|
|
*
|
|
* tkinter hooks
|
|
*
|
|
* history:
|
|
* 99-07-26 fl created
|
|
* 99-08-15 fl moved to its own support module
|
|
*
|
|
* Copyright (c) Secret Labs AB 1999.
|
|
*
|
|
* See the README file for information on usage and redistribution.
|
|
*/
|
|
|
|
|
|
#include "Python.h"
|
|
#include "Imaging.h"
|
|
|
|
#include "tk.h"
|
|
|
|
/* must link with Tk/tkImaging.c */
|
|
extern void TkImaging_Init(Tcl_Interp* interp);
|
|
|
|
/* copied from _tkinter.c (this isn't as bad as it may seem: for new
|
|
versions, we use _tkinter's interpaddr hook instead, and all older
|
|
versions use this structure layout) */
|
|
|
|
typedef struct {
|
|
PyObject_HEAD
|
|
Tcl_Interp* interp;
|
|
} TkappObject;
|
|
|
|
static PyObject*
|
|
_tkinit(PyObject* self, PyObject* args)
|
|
{
|
|
Tcl_Interp* interp;
|
|
|
|
long arg;
|
|
int is_interp;
|
|
if (!PyArg_ParseTuple(args, "li", &arg, &is_interp))
|
|
return NULL;
|
|
|
|
if (is_interp)
|
|
interp = (Tcl_Interp*) arg;
|
|
else {
|
|
TkappObject* app;
|
|
/* Do it the hard way. This will break if the TkappObject
|
|
layout changes */
|
|
app = (TkappObject*) arg;
|
|
interp = app->interp;
|
|
}
|
|
|
|
/* This will bomb if interp is invalid... */
|
|
TkImaging_Init(interp);
|
|
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
|
|
static PyMethodDef functions[] = {
|
|
/* Tkinter interface stuff */
|
|
{"tkinit", (PyCFunction)_tkinit, 1},
|
|
{NULL, NULL} /* sentinel */
|
|
};
|
|
|
|
#if PY_VERSION_HEX >= 0x03000000
|
|
PyMODINIT_FUNC
|
|
PyInit__imagingtk(void) {
|
|
static PyModuleDef module_def = {
|
|
PyModuleDef_HEAD_INIT,
|
|
"_imagingtk", /* m_name */
|
|
NULL, /* m_doc */
|
|
-1, /* m_size */
|
|
functions, /* m_methods */
|
|
};
|
|
|
|
return PyModule_Create(&module_def);
|
|
}
|
|
#else
|
|
PyMODINIT_FUNC
|
|
init_imagingtk(void)
|
|
{
|
|
Py_InitModule("_imagingtk", functions);
|
|
}
|
|
#endif
|
|
|