Initial Python 3 port
Many things work, some don't. Notably, genPOI doesn't work, and there's some signedness comparison stuff going on in the C extension. This also completely drops support for Python 2, as maintaining a C extension for both Python 2 and 3 is a pain and not worth it for the 9 months that Python 2 is still going to be supported upstream. The documentation needs to be adjusted as well. All of the few tests we have pass, and rendering a map works, both with a configuration file and without. We can also use optimizeimages. Concerns #1528.
This commit is contained in:
@@ -38,12 +38,20 @@ static PyMethodDef COverviewerMethods[] = {
|
||||
{NULL, NULL, 0, NULL} /* Sentinel */
|
||||
};
|
||||
|
||||
static PyModuleDef COverviewerModule = {
|
||||
PyModuleDef_HEAD_INIT,
|
||||
"c_overviewer",
|
||||
"", // TODO: Add documentation here.
|
||||
-1,
|
||||
COverviewerMethods
|
||||
};
|
||||
|
||||
|
||||
PyMODINIT_FUNC
|
||||
initc_overviewer(void)
|
||||
PyInit_c_overviewer(void)
|
||||
{
|
||||
PyObject *mod, *numpy;
|
||||
mod = Py_InitModule("c_overviewer", COverviewerMethods);
|
||||
mod = PyModule_Create(&COverviewerModule);
|
||||
|
||||
/* for numpy
|
||||
normally you should use import_array(), but that will break across
|
||||
@@ -57,8 +65,9 @@ initc_overviewer(void)
|
||||
if (!init_chunk_render()) {
|
||||
PyErr_Print();
|
||||
exit(1);
|
||||
return;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
init_endian();
|
||||
return mod;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user