Skip to content

Commit f0c7298

Browse files
committed
Fix binary/text error and update tests.
1 parent 8739219 commit f0c7298

2 files changed

Lines changed: 4 additions & 3 deletions

File tree

gnupg.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1665,7 +1665,7 @@ def get_recipients_file(self, file, extra_args=None):
16651665
if extra_args:
16661666
args.extend(extra_args)
16671667
result = self.result_map['crypt'](self)
1668-
self._handle_io(args, file, result, passphrase=None)
1668+
self._handle_io(args, file, result, binary=True)
16691669
ids = []
16701670
for m in PUBLIC_KEY_RE.finditer(result.stderr):
16711671
ids.append(m.group(1))

test_gnupg.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1240,7 +1240,7 @@ def test_no_such_key(self):
12401240
self.remove_all_existing_keys()
12411241
decrypted = gpg.decrypt(str(encrypted), passphrase='bbrown')
12421242
self.assertFalse(decrypted.ok)
1243-
expected = 'decryption failed' if gpg.version >= (2, 3) else 'no secret key'
1243+
expected = 'decryption failed' if gpg.version == (2, 3, 1) else 'no secret key'
12441244
self.assertEqual(decrypted.status, expected)
12451245
finally:
12461246
logger.debug("test_no_such_key ends")
@@ -1255,7 +1255,8 @@ def test_get_recipients(self):
12551255
key2 = gpg.gen_key(inp)
12561256
data = 'super secret'.encode(gpg.encoding)
12571257
edata = gpg.encrypt(data, (key1.fingerprint, key2.fingerprint))
1258-
ids = gpg.get_recipients(edata.data)
1258+
logger.debug('Getting recipients')
1259+
ids = gpg.get_recipients(edata.data.decode(gpg.encoding))
12591260
self.assertGreater(len(ids), 0)
12601261
idlen = len(ids[0])
12611262
ids = set(ids)

0 commit comments

Comments
 (0)