[gnome-keysign: 5/9] removed monkeysign support



commit b715fe4592709857ea515de6ef23c9f33b3c7900
Author: Tobias Mueller <muelli cryptobitch de>
Date:   Mon Oct 29 18:39:30 2018 +0100

    removed monkeysign support
    
    We assume to have gpgme support in all our targets, now.  Removing this
    allows us for removing one layer of indirection which simplifies the
    code a little bit.

 README.rst           |   2 +-
 keysign/gpgmh.py     |  10 +-
 keysign/gpgmks.py    | 436 ---------------------------------------------------
 setup.cfg            |   1 -
 tests/test_gpgmks.py | 366 ------------------------------------------
 5 files changed, 2 insertions(+), 813 deletions(-)
---
diff --git a/README.rst b/README.rst
index b77927d..9f770a8 100644
--- a/README.rst
+++ b/README.rst
@@ -97,7 +97,7 @@ gstreamer1.0-plugins-good provides the autovideosrc element.
 
 These packages should be optional:
 
-    python-requests monkeysign python-qrcode python-bluez
+    python-requests python-qrcode python-bluez
 
 
 Fedora dependencies
diff --git a/keysign/gpgmh.py b/keysign/gpgmh.py
index 8105e2d..db80e24 100755
--- a/keysign/gpgmh.py
+++ b/keysign/gpgmh.py
@@ -31,15 +31,7 @@ log = logging.getLogger(__name__)
 # because it may turn out to be not working as well as expected.
 # We also use the standard monkeysign module for now, because
 # we know it better.  Expect that to change, though.
-try:
-    GPGME = int(os.environ.get("KEYSIGN_GPGME", 1))
-    if GPGME:
-        from . import gpgmeh as gpg
-    else:
-        from . import gpgmks as gpg
-except ImportError:
-    log.exception("Error import gpgmeh, falling back tp gpgmks")
-    from . import gpgmks as gpg
+from . import gpgmeh as gpg
 
 
 # We expect these functions:
diff --git a/setup.cfg b/setup.cfg
index 7e96d84..e3c5c43 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -37,5 +37,4 @@ cover-html-dir=coverage/
 cover-branches=1
 cover-min-percentage=70
 #where=tests
-#tests=test_gpgmks
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]