[gnome-keysign] delete gpgmh

[Tobias Mueller <tobiasmue src gnome org>]

commit 42d20ae8eb71eec8b11ccead7fb50d7701293336
Author: Tobias Mueller <muelli cryptobitch de>
Date:   Thu Jan 3 13:52:19 2019 +0100

    delete gpgmh
    
    This module is not necessary any more, because we use gpgme exclusively.
      We used to have this abstraction, because we were using monkeysign and
    unify gpg access through this module.  But now we have gotten rid of
    monkeysign and there is no point in having a wrapper for one underlying
    library.  So we use gpgmeh directly.  This is a fairly mechanical
    change, i.e. sed -i s,gpgmh,gpgmeh,g.  It seems to work well, though.

 keysign/GPGQRCode.py        |  2 +-
 keysign/KeyPresent.py       |  4 ++--
 keysign/Keyserver.py        |  2 +-
 keysign/app.py              |  4 ++--
 keysign/avahidiscovery.py   |  4 ++--
 keysign/avahioffer.py       |  2 +-
 keysign/bluetoothoffer.py   |  2 +-
 keysign/bluetoothreceive.py |  2 +-
 keysign/gpgmh.py            | 44 --------------------------------------------
 keysign/keyconfirm.py       |  2 +-
 keysign/keylistwidget.py    |  6 +++---
 keysign/receive.py          |  2 +-
 keysign/send.py             |  6 +++---
 keysign/util.py             |  4 ++--
 keysign/wormholeoffer.py    |  2 +-
 keysign/wormholereceive.py  |  2 +-
 16 files changed, 23 insertions(+), 67 deletions(-)
---
diff --git a/keysign/GPGQRCode.py b/keysign/GPGQRCode.py
index 26d18a0..20e5022 100755
--- a/keysign/GPGQRCode.py
+++ b/keysign/GPGQRCode.py
@@ -38,7 +38,7 @@ if  __name__ == "__main__" and __package__ is None:
     #sys.modules["keysign"] = mod
     __package__ = str('keysign')
 
-from .gpgmh import get_usable_keys
+from .gpgmeh import get_usable_keys
 
 if  __name__ == "__main__" and __package__ is None:
     logging.getLogger().error("You seem to be trying to execute " +
diff --git a/keysign/KeyPresent.py b/keysign/KeyPresent.py
index 2ecaf2a..edcd881 100755
--- a/keysign/KeyPresent.py
+++ b/keysign/KeyPresent.py
@@ -38,7 +38,7 @@ if  __name__ == "__main__" and __package__ is None:
     __package__ = str('keysign')
 
 from .__init__ import __version__
-from .gpgmh import get_usable_keys
+from .gpgmeh import get_usable_keys
 from .QRCode import QRImage
 from .util import format_fingerprint
 
@@ -48,7 +48,7 @@ log = logging.getLogger(__name__)
 
 
 class KeyPresentWidget(Gtk.Widget):
-    """A widget for presenting a gpgmh.Key
+    """A widget for presenting a gpgmeh.Key
 
     It shows details of the given key and customizable data in a
     qrcode encoded in a QRImage.
diff --git a/keysign/Keyserver.py b/keysign/Keyserver.py
index 540b95d..bc44d0e 100755
--- a/keysign/Keyserver.py
+++ b/keysign/Keyserver.py
@@ -47,7 +47,7 @@ if  __name__ == "__main__" and __package__ is None:
 from .__init__ import __version__
 from .network.AvahiPublisher import AvahiPublisher
 
-from .gpgmh import fingerprint_from_keydata
+from .gpgmeh import fingerprint_from_keydata
 
 log = logging.getLogger(__name__)
 
diff --git a/keysign/app.py b/keysign/app.py
index b962dd4..8b01a6f 100755
--- a/keysign/app.py
+++ b/keysign/app.py
@@ -54,8 +54,8 @@ from .keyconfirm import PreSignWidget
 from .keyfprscan import KeyFprScanWidget
 from .keylistwidget import KeyListWidget
 from .KeyPresent import KeyPresentWidget
-from .gpgmh import openpgpkey_from_data
-from . import gpgmh
+from .gpgmeh import openpgpkey_from_data
+from . import gpgmeh
 from .i18n import _
 from .receive import ReceiveApp
 from .send import SendApp
diff --git a/keysign/avahidiscovery.py b/keysign/avahidiscovery.py
index 2419632..7b58287 100755
--- a/keysign/avahidiscovery.py
+++ b/keysign/avahidiscovery.py
@@ -41,10 +41,10 @@ if  __name__ == "__main__" and __package__ is None:
 from .util import strip_fingerprint, download_key_http, parse_barcode
 
 try:
-    from .gpgmh import fingerprint_from_keydata
+    from .gpgmeh import fingerprint_from_keydata
 except ImportError:
     # FIXME: Remove this conditional
-    from .gpgmh import fingerprint_for_key as fingerprint_from_keydata
+    from .gpgmeh import fingerprint_for_key as fingerprint_from_keydata
 
 from .network.AvahiBrowser import AvahiBrowser
 from .util import mac_verify
diff --git a/keysign/avahioffer.py b/keysign/avahioffer.py
index 380dc4a..6c9434e 100755
--- a/keysign/avahioffer.py
+++ b/keysign/avahioffer.py
@@ -36,7 +36,7 @@ if __name__ == "__main__" and __package__ is None:
     __package__ = str('keysign')
 
 from .__init__ import __version__
-from .gpgmh import get_usable_keys, get_public_key_data
+from .gpgmeh import get_usable_keys, get_public_key_data
 from .i18n import _
 from .util import mac_generate, format_fingerprint
 from . import Keyserver
diff --git a/keysign/bluetoothoffer.py b/keysign/bluetoothoffer.py
index 8ef6dbe..018b26f 100644
--- a/keysign/bluetoothoffer.py
+++ b/keysign/bluetoothoffer.py
@@ -29,7 +29,7 @@ if __name__ == "__main__" and __package__ is None:
     __package__ = str('keysign')
 
 from .errors import NoBluezDbus, NoAdapter, UnpoweredAdapter
-from .gpgmh import get_public_key_data, get_usable_keys
+from .gpgmeh import get_public_key_data, get_usable_keys
 from .i18n import _
 from .util import get_local_bt_address, mac_generate
 
diff --git a/keysign/bluetoothreceive.py b/keysign/bluetoothreceive.py
index 61e741a..445cecd 100644
--- a/keysign/bluetoothreceive.py
+++ b/keysign/bluetoothreceive.py
@@ -25,7 +25,7 @@ if __name__ == "__main__" and __package__ is None:
     #sys.modules["keysign"] = mod
     __package__ = str('keysign')
 
-from .gpgmh import fingerprint_from_keydata
+from .gpgmeh import fingerprint_from_keydata
 from .i18n import _
 from .util import mac_verify
 
diff --git a/keysign/keyconfirm.py b/keysign/keyconfirm.py
index a48b161..a8e9761 100755
--- a/keysign/keyconfirm.py
+++ b/keysign/keyconfirm.py
@@ -45,7 +45,7 @@ if  __name__ == "__main__" and __package__ is None:
     __package__ = str('keysign')
 
 
-from .gpgmh import get_usable_keys
+from .gpgmeh import get_usable_keys
 from .scan_barcode import ScalingImage
 from .util import format_fingerprint
 
diff --git a/keysign/keylistwidget.py b/keysign/keylistwidget.py
index 26845d5..f9c853e 100755
--- a/keysign/keylistwidget.py
+++ b/keysign/keylistwidget.py
@@ -21,7 +21,7 @@ if  __name__ == "__main__" and __package__ is None:
     #sys.modules["keysign"] = mod
     __package__ = str('keysign')
 
-from .gpgmh import get_usable_keys
+from .gpgmeh import get_usable_keys
 from .i18n import _
 from .util import fix_infobar
 
@@ -57,7 +57,7 @@ class ListBoxRowWithKey(Gtk.ListBoxRow):
 
     @classmethod
     def format_uid(cls, uid):
-        "Returns a pango string for a gpgmh.UID"
+        "Returns a pango string for a gpgmeh.UID"
         fmt = "{name}\t<i>{email}</i>\t<small>{expiry}</small>"
 
         items = ('name', 'email', 'expiry')
@@ -76,7 +76,7 @@ class ListBoxRowWithKey(Gtk.ListBoxRow):
 
     @classmethod
     def format(cls, key):
-        "Returns a pango string for a gpgmh.Key"
+        "Returns a pango string for a gpgmeh.Key"
         fmt  = "{created} "
         fmt  = "<b>{fingerprint}</b>\n"
         fmt += "\n".join((cls.format_uid(uid) for uid in key.uidslist))
diff --git a/keysign/receive.py b/keysign/receive.py
index 4c4dde1..98cb5ee 100755
--- a/keysign/receive.py
+++ b/keysign/receive.py
@@ -51,7 +51,7 @@ if  __name__ == "__main__" and __package__ is None:
 from .avahidiscovery import AvahiKeysignDiscoveryWithMac
 from .discover import Discover
 from .errors import NoBluezDbus, UnpoweredAdapter, NoAdapter
-from .gpgmh import openpgpkey_from_data
+from .gpgmeh import openpgpkey_from_data
 from .i18n import _
 from .keyfprscan import KeyFprScanWidget
 from .keyconfirm import PreSignWidget
diff --git a/keysign/send.py b/keysign/send.py
index 7331bfd..95deb80 100755
--- a/keysign/send.py
+++ b/keysign/send.py
@@ -30,7 +30,7 @@ if  __name__ == "__main__" and __package__ is None:
 from .keylistwidget import KeyListWidget
 from .KeyPresent import KeyPresentWidget
 from .offer import Offer
-from . import gpgmh
+from . import gpgmeh
 # We import i18n to have the locale set up for Glade
 from .i18n import _
 log = logging.getLogger(__name__)
@@ -64,7 +64,7 @@ class SendApp:
         if not builder:
             builder = Gtk.Builder()
             builder.add_objects_from_file(ui_file_path, ["send_stack"])
-        keys = gpgmh.get_usable_secret_keys()
+        keys = gpgmeh.get_usable_secret_keys()
         klw = KeyListWidget(keys, builder=builder)
         klw.connect("key-activated", self.on_key_activated)
         self.klw = klw
@@ -82,7 +82,7 @@ class SendApp:
         # currently attached to a GtkStack. When our custom widget
         # code runs, it detaches itself from its parent, i.e. the stack.
         # We need need to instantiate the widget with key, however.
-        fakekey = gpgmh.Key("","","")
+        fakekey = gpgmeh.Key("","","")
         kpw = KeyPresentWidget(fakekey, "", builder=builder)
 
         self.rb = builder.get_object('resultbox')
diff --git a/keysign/util.py b/keysign/util.py
index 05b4dd5..076d45b 100755
--- a/keysign/util.py
+++ b/keysign/util.py
@@ -47,8 +47,8 @@ gi.require_version('Gtk', '3.0')
 from gi.repository import Gtk, Gdk, GLib
 
 from .errors import NoBluezDbus, UnpoweredAdapter, NoAdapter
-from .gpgmh import fingerprint_from_keydata
-from .gpgmh import sign_keydata_and_encrypt
+from .gpgmeh import fingerprint_from_keydata
+from .gpgmeh import sign_keydata_and_encrypt
 from .i18n import _
 
 log = logging.getLogger(__name__)
diff --git a/keysign/wormholeoffer.py b/keysign/wormholeoffer.py
index 69b9b0d..8eec4b3 100644
--- a/keysign/wormholeoffer.py
+++ b/keysign/wormholeoffer.py
@@ -44,7 +44,7 @@ if __name__ == "__main__" and __package__ is None:
     os.sys.path.insert(0, os.path.join(parent_dir, 'monkeysign'))
     __package__ = str('keysign')
 
-from .gpgmh import get_usable_keys, get_public_key_data
+from .gpgmeh import get_usable_keys, get_public_key_data
 from .util import encode_message, decode_message
 
 log = logging.getLogger(__name__)
diff --git a/keysign/wormholereceive.py b/keysign/wormholereceive.py
index 9636e76..aa62137 100644
--- a/keysign/wormholereceive.py
+++ b/keysign/wormholereceive.py
@@ -31,7 +31,7 @@ if __name__ == "__main__":
     gtk3reactor.install()
 from twisted.internet import reactor
 
-from .gpgmh import fingerprint_from_keydata
+from .gpgmeh import fingerprint_from_keydata
 from .i18n import _
 from .util import decode_message, encode_message, parse_barcode, mac_verify