=== modified file 'mandos'
--- mandos	2016-03-19 22:00:38 +0000
+++ mandos	2016-06-03 17:23:10 +0000
@@ -180,8 +180,10 @@
         self.gnupgargs = ['--batch',
                           '--homedir', self.tempdir,
                           '--force-mdc',
-                          '--quiet',
-                          '--no-use-agent']
+                          '--quiet']
+        # Only GPG version 1 has the --no-use-agent option.
+        if self.gpg == "gpg" or self.gpg.endswith("/gpg"):
+            self.gnupgargs.append("--no-use-agent")
     
     def __enter__(self):
         return self