Merge remote-tracking branch 'JamesMaroney/master' into develop

isislovecruft · Jul 25, 2018 · 6182885 · 6182885
2 parents 704491b + ea6a062
commit 6182885
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pretty_bad_protocol/_meta.py b/pretty_bad_protocol/_meta.py
@@ -955,7 +955,7 @@ def _encrypt(self, data, recipients,
         >>> encrypted = str(gpg.encrypt(message, key.fingerprint))
         >>> assert encrypted != message
         >>> assert not encrypted.isspace()
-        >>> decrypted = str(gpg.decrypt(encrypted))
+        >>> decrypted = str(gpg.decrypt(encrypted, passphrase='foo'))
         >>> assert not decrypted.isspace()
         >>> decrypted
         'The crow flies at midnight.'

diff --git a/pretty_bad_protocol/gnupg.py b/pretty_bad_protocol/gnupg.py
@@ -1031,7 +1031,7 @@ def encrypt(self, data, *recipients, **kwargs):
         >>> encrypted = str(gpg.encrypt(message, key.fingerprint))
         >>> assert encrypted != message
         >>> assert not encrypted.isspace()
-        >>> decrypted = str(gpg.decrypt(encrypted))
+        >>> decrypted = str(gpg.decrypt(encrypted, passphrase='foo'))
         >>> assert not decrypted.isspace()
         >>> decrypted
         'The crow flies at midnight.'