Fix python3 pyspatialite import

qgis · Sep 27, 2016 · 34588f3 · 34588f3
1 parent 49e64ab
commit 34588f3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/python/ext-libs/pyspatialite/lib/dbapi2.py b/python/ext-libs/pyspatialite/lib/dbapi2.py
@@ -50,7 +50,10 @@ def TimestampFromTicks(ticks):
 version_info = tuple([int(x) for x in version.split(".")])
 sqlite_version_info = tuple([int(x) for x in sqlite_version.split(".")])
 
-Binary = buffer
+# buffer is no longer supported is python 3
+# memoryview fit 2.7 and 3+
+# see https://docs.python.org/2/c-api/buffer.html
+Binary = memoryview
 
 def register_adapters_and_converters():
     def adapt_date(val):

diff --git a/python/ext-libs/pyspatialite/src/module.c b/python/ext-libs/pyspatialite/src/module.c
@@ -329,7 +329,11 @@ static struct PyModuleDef _sqlite3module = {
 };
 #endif
 
+#if PY_MAJOR_VERSION < 3
 PyMODINIT_FUNC init_spatialite(void)
+#else
+PyMODINIT_FUNC PyInit__spatialite(void)
+#endif
 {
     PyObject *module, *dict;
     PyObject *tmp_obj;