Unsignedio
/
python-gnupg
mirror of https://github.com/markqvist/python-gnupg.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Add missing option `--batch` to _allowed options set. 

* Rearranged the other options because their order was nolens volens.
feature/documentation-builds-html
Isis Lovecruft 2013-04-09 17:35:10 +00:00
parent 09481d27ae
commit 9af49dbce5
No known key found for this signature in database
GPG Key ID: A3ADB67A2CDB8B35
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gnupg.py
View File

@ -406,12 +406,18 @@ def _is_allowed(input):
## eg, --no-show-photos would mitigate things like ## eg, --no-show-photos would mitigate things like
## https://www-01.ibm.com/support/docview.wss?uid=swg21620982 ## https://www-01.ibm.com/support/docview.wss?uid=swg21620982
_allowed = frozenset( _allowed = frozenset(
['--list-packets', '--delete-keys', '--delete-secret-keys', ['--list-keys', '--list-packets', '--with-colons',
'--encrypt', '--print-mds', '--print-md', '--sign', '--delete-keys', '--delete-secret-keys',
'--encrypt-files', '--gen-key', '--decrypt', '--decrypt-files', '--encrypt', '--encrypt-files',
'--list-keys', '--import', '--verify', '--version', '--print-mds', '--print-md', '--sign',
'--status-fd', '--no-tty', '--homedir', '--no-default-keyring', '--gen-key', '--batch',
'--keyring', '--passphrase-fd', '--fingerprint', '--with-colons']) '--decrypt', '--decrypt-files',
'--import',
'--verify',
'--version',
'--status-fd', '--no-tty', '--passphrase-fd',
'--homedir', '--no-default-keyring', '--keyring',
'--fingerprint'])
## check that _allowed is a subset of _possible ## check that _allowed is a subset of _possible
try: try:
@ -1760,7 +1766,7 @@ class GPG(object):
:param always_trust: Instruct GnuPG to ignore trust checks. :param always_trust: Instruct GnuPG to ignore trust checks.
:param passphrase: The passphrase for the secret key used for decryption. :param passphrase: The passphrase for the secret key used for decryption.
:param output: A file to write the decrypted output to. :param output: A file to write the decrypted output to.
""" """
args = ["--decrypt"] args = ["--decrypt"]
if output: # write the output to a file with the specified name if output: # write the output to a file with the specified name
if os.path.exists(output): if os.path.exists(output):