Merge branch 'dev', added Python 3 support.

Author: erikbos

mapcodemodule.c

@@ -151,7 +151,26 @@ static PyMethodDef mapcode_methods[] = {
 };
 
 /* Initialisation that gets called when module is imported. */
+#if PY_MAJOR_VERSION >= 3
+PyMODINIT_FUNC PyInit_mapcode(void)
+{
+    static struct PyModuleDef mapcode_module = {
+        PyModuleDef_HEAD_INIT,
+        "mapcode",           /* m_name */
+        mapcode_doc,         /* m_doc */
+        -1,                  /* m_size */
+        mapcode_methods,     /* m_methods */
+        NULL,                /* m_reload */
+        NULL,                /* m_traverse */
+        NULL,                /* m_clear */
+        NULL,                /* m_free */
+    };
+
+    return(PyModule_Create(&mapcode_module));
+}
+#else
 PyMODINIT_FUNC initmapcode(void)
 {
     Py_InitModule3("mapcode", mapcode_methods, mapcode_doc);
 }
+#endif

setup.py

@@ -3,19 +3,20 @@
 
 from distutils.core import setup, Extension
 
+module_version = '2.0.0.2'
 
 setup(
     name='mapcode',
     ext_modules=[Extension('mapcode',
                            sources=['mapcodemodule.c', 'mapcodelib/mapcoder.c'],
                            include_dirs=['mapcodelib']
                            )],
-    version='2.0.0.0',
+    version=module_version,
     description='A Python module to do mapcode encoding and decoding.  See http://www.mapcode.com for more information.',
     author='Erik Bos',
     author_email='erik@xs4all.nl',
     url='https://github.com/mapcode-foundation/mapcode-python',
-    download_url='https://github.com/mapcode-foundation/mapcode-python/tarball/v2.0.0.1',
+    download_url='https://github.com/mapcode-foundation/mapcode-python/tarball/v' + module_version,
     license='Apache License 2.0',
     classifiers=[
        'Development Status :: 5 - Production/Stable',