python: Expend VERSION at build time

This is now easier than importing __version__ from the
C module.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/python/location-downloader.in b/src/python/location-downloader.in
index 1b5932d5822e03737d32b2a27816815b2f7e74dd..71a4007eb850e5ba4d67e9cada57faa51f44a67e 100644 (file)
--- a/src/python/location-downloader.in
+++ b/src/python/location-downloader.in
@@ -103,7 +103,7 @@ class Downloader(object):
 
                # Update headers
                headers.update({
-                       "User-Agent" : "location-downloader/%s" % location.__version__,
+                       "User-Agent" : "location-downloader/@VERSION@",
                })
 
                # Set headers
@@ -251,7 +251,7 @@ class CLI(object):
 
                # version
                parser.add_argument("--version", action="version",
-                       version="%%(prog)s %s" % location.__version__)
+                       version="%(prog)s @VERSION@")
 
                # database
                parser.add_argument("--database", "-d",

diff --git a/src/python/location-exporter.in b/src/python/location-exporter.in
index b2c0dcc01556966205787701d90a41949e228845..cd37db3d4c6fcdbdb2c29f668ecd8977ac8fc83e 100644 (file)
--- a/src/python/location-exporter.in
+++ b/src/python/location-exporter.in
@@ -228,7 +228,7 @@ class CLI(object):
 
                # version
                parser.add_argument("--version", action="version",
-                       version="%%(prog)s %s" % location.__version__)
+                       version="%(prog)s @VERSION@")
 
                # database
                parser.add_argument("--database", "-d",

diff --git a/src/python/location-query.in b/src/python/location-query.in
index f22b23e954cdb45c0b631478a16d613e6744e17b..0384cbc0d0582624e70bf81849d430d0cd8d3c41 100644 (file)
--- a/src/python/location-query.in
+++ b/src/python/location-query.in
@@ -131,7 +131,7 @@ class CLI(object):
 
                # version
                parser.add_argument("--version", action="version",
-                       version="%%(prog)s %s" % location.__version__)
+                       version="%(prog)s @VERSION@")
 
                # database
                parser.add_argument("--database", "-d",

diff --git a/src/python/locationmodule.c b/src/python/locationmodule.c
index c7f4cff93cf4051f60fca756ec08d7a7d4dd1b4e..dd83e53b46d603b916c13beb7ea9bc7231b89106 100644 (file)
--- a/src/python/locationmodule.c
+++ b/src/python/locationmodule.c
@@ -160,10 +160,6 @@ PyMODINIT_FUNC PyInit__location(void) {
        Py_INCREF(&WriterType);
        PyModule_AddObject(m, "Writer", (PyObject *)&WriterType);
 
-       // Add constants
-       if (PyModule_AddStringConstant(m, "__version__", VERSION))
-               return NULL;
-
        // Add flags
        if (PyModule_AddIntConstant(m, "NETWORK_FLAG_ANONYMOUS_PROXY", LOC_NETWORK_FLAG_ANONYMOUS_PROXY))
                return NULL;