Remove gnupg from our sources and optionnaly depend on it. Fixes #8475

README.html

@@ -25,6 +25,7 @@
 <li>python3-openssl (>=0.14) for <em>secure</em> SSL/TLS. Python's default SSL is insecure, so this package is highly recommended!</li>
 <li>python3-pyasn1 to check SSL/TLS certificate</li>
 <li>python3-crypto to enable End to end encryption</li>
+<li>python3-gnupg to enable GPG encryption</li>
 <li>For zeroconf (bonjour), the "enable link-local messaging" checkbox, you need dbus-glib, python-avahi</li>
 <li>dnsutils (or whatever package provides the nslookup binary) for SRV support</li>
 <li>gir1.2-gtkspell3-3.0 and aspell-LANG where lang is your locale eg. en, fr etc</li>

src/common/gajim.py

@@ -162,7 +162,7 @@ except ImportError:
 HAVE_GPG = True
 GPG_BINARY = 'gpg'
 try:
-    __import__('common.gnupg', globals(), locals(), [], 0)
+    __import__('gnupg', globals(), locals(), [], 0)
 except ImportError:
     HAVE_GPG = False
 else:

src/common/gpg.py

@@ -24,9 +24,11 @@
 
 from common.gajim import HAVE_GPG, GPG_BINARY
 import os
+import logging
 
 if HAVE_GPG:
-    from common import gnupg
+    import gnupg
+    gnupg.logger = logging.getLogger('gajim.c.gnupg')
 
     class GnuPG(gnupg.GPG):
         def __init__(self, use_agent=False):