Merge lp:~jelmer/pygpgme/bug452194 into lp:pygpgme

[Jelmer Vernooij]

Initialize GPGME properly by calling gpgme_check_version().

This adds a call to gpgme_check_version() to PyGPGME. Without this, all functions in PyGPGME modules built against newer versions of GPGME fail with GPG_ERR_NOT_OPERATIONAL.

[Michael Hudson-Doyle (mwhudson)]

Looks reasonable to me but I don't know anything about gpgme :-)

[James Henstridge (jamesh)]

Looks pretty good. A few questions:

1. The documentation (http://www.gnupg.org/documentation/manuals/gpgme/Library-Version-Check.html) says this method can fail and return NULL. Please add a check for that.

2. Could you change the variable to lower case?

review: Needs Fixing

[lp:~jelmer/pygpgme/bug452194]

70. By Jelmer Vernooij on 2010-05-20

Rename GPGME_VERSION -> gpgme_version, raise exception if initializing gpgme fails.

[James Henstridge (jamesh)]

Looks good.

review: Approve

=== modified file 'src/gpgme.c'
--- src/gpgme.c	2009-04-01 10:05:25 +0000
+++ src/gpgme.c	2010-05-20 10:44:30 +0000
@@ -38,6 +38,7 @@
 static PyObject *
 create_module(void)
 {
+    const char *gpgme_version;
     PyObject *mod;
 
     pygpgme_error = PyErr_NewException("gpgme.GpgmeError",
@@ -88,6 +89,15 @@
     Py_INCREF(pygpgme_error);
     PyModule_AddObject(mod, "GpgmeError", pygpgme_error);
 
+    gpgme_version = gpgme_check_version(NULL);
+    if (gpgme_version == NULL) {
+        PyErr_SetString(PyExc_ImportError, "Unable to initialize gpgme.");
+        Py_DECREF(mod);
+        return NULL;
+    }
+    PyModule_AddObject(mod, "gpgme_version",
+                       PyString_FromString(gpgme_version));
+
     return mod;
 }