Skip to content

decrypt_file: Use a more descriptive argument name for filename #273

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rht wants to merge 1 commit into
base: master
Choose a base branch
from
Open

decrypt_file: Use a more descriptive argument name for filename #273

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions pretty_bad_protocol/gnupg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1086,14 +1086,14 @@ def decrypt(self, message, **kwargs):
stream.close()
return result

def decrypt_file(self, filename, always_trust=False, passphrase=None,
def decrypt_file(self, fileobject, always_trust=False, passphrase=None,
output=None):
"""Decrypt the contents of a file-like object ``filename`` .
"""Decrypt the contents of a file-like object ``fileobject`` .

:param str filename: A file-like object to decrypt.
:param io.BytesIO fileobject: A file-like object to decrypt.
:param bool always_trust: Instruct GnuPG to ignore trust checks.
:param str passphrase: The passphrase for the secret key used for decryption.
:param str output: A filename to write the decrypted output to.
:param str output: A fileobject to write the decrypted output to.
"""
args = ["--decrypt"]
if output: # write the output to a file with the specified name
Expand All @@ -1103,7 +1103,7 @@ def decrypt_file(self, filename, always_trust=False, passphrase=None,
if always_trust:
args.append("--always-trust")
result = self._result_map['crypt'](self)
self._handle_io(args, filename, result, passphrase, binary=True)
self._handle_io(args, fileobject, result, passphrase, binary=True)
log.debug('decrypt result: %r', result.data)
return result

Expand Down