From 20301dd3d55c81e3655c367b4d74382cec499717 Mon Sep 17 00:00:00 2001
From: Michał Górny <mgorny@gentoo.org>
Date: Sat, 16 May 2020 17:11:25 +0200
Subject: openpgp: Default stdin='' in _spawn_gpg()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 gemato/openpgp.py | 12 ++++++------
 tests/testutil.py |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/gemato/openpgp.py b/gemato/openpgp.py
index 364da66..36c0be3 100644
--- a/gemato/openpgp.py
+++ b/gemato/openpgp.py
@@ -150,7 +150,7 @@ class OpenPGPSystemEnvironment(object):
 
         outf.write(out.decode('utf8'))
 
-    def _spawn_gpg(self, argv, stdin, env_override={}):
+    def _spawn_gpg(self, argv, stdin='', env_override={}):
         env = os.environ.copy()
         env['TZ'] = 'UTC'
         env.update(env_override)
@@ -257,7 +257,7 @@ debug-level guru
         """
         # list all keys in the keyring
         exitst, out, err = self._spawn_gpg(
-            ['gpg', '--batch', '--with-colons', '--list-keys'], '')
+            ['gpg', '--batch', '--with-colons', '--list-keys'])
         if exitst != 0:
             raise gemato.exceptions.OpenPGPKeyRefreshError(err.decode('utf8'))
 
@@ -315,7 +315,7 @@ debug-level guru
         with self.clone() as subenv:
             # use --locate-keys to fetch keys via WKD
             exitst, out, err = subenv._spawn_gpg(
-                ['gpg', '--batch', '--locate-keys'] + list(addrs), '')
+                ['gpg', '--batch', '--locate-keys'] + list(addrs))
             # if at least one fetch failed, gpg returns unsuccessfully
             if exitst != 0:
                 logging.debug('refresh_keys_wkd(): gpg --locate-keys failed: {}'
@@ -324,7 +324,7 @@ debug-level guru
 
             # otherwise, xfer the keys
             exitst, out, err = subenv._spawn_gpg(
-                ['gpg', '--batch', '--export'] + list(keys), '')
+                ['gpg', '--batch', '--export'] + list(keys))
             if exitst != 0:
                 logging.debug('refresh_keys_wkd(): gpg --export failed: {}'
                               .format(err.decode('utf8')))
@@ -356,7 +356,7 @@ debug-level guru
             ks_args = ['--keyserver', keyserver]
 
         exitst, out, err = self._spawn_gpg(
-            ['gpg', '--batch', '--refresh-keys'] + ks_args, '')
+            ['gpg', '--batch', '--refresh-keys'] + ks_args)
         if exitst != 0:
             raise gemato.exceptions.OpenPGPKeyRefreshError(err.decode('utf8'))
 
@@ -374,7 +374,7 @@ debug-level guru
         assert self._home is not None
         return self._home
 
-    def _spawn_gpg(self, options, stdin):
+    def _spawn_gpg(self, options, stdin=''):
         env_override = {'GNUPGHOME': self.home}
         return (super(OpenPGPEnvironment, self)
                 ._spawn_gpg(options, stdin, env_override))
diff --git a/tests/testutil.py b/tests/testutil.py
index 572dad6..f95b274 100644
--- a/tests/testutil.py
+++ b/tests/testutil.py
@@ -141,7 +141,7 @@ class MockedWKDOpenPGPEnvironment(gemato.openpgp.OpenPGPEnvironment):
     def clone(self):
         return MockedWKDOpenPGPEnvironment(self.keys)
 
-    def _spawn_gpg(self, argv, stdin):
+    def _spawn_gpg(self, argv, stdin=''):
         if '--locate-keys' in argv:
             argv.remove('--locate-keys')
             assert len(argv) == 3
-- 
cgit v1.2.3