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

Remove the version string from generated keys, encrypted files, and sigs.

testing/mmn/mktime_takes_localtime_not_gmtime
Isis Lovecruft 2013-05-10 09:33:07 +00:00
parent ce323251ed
commit 04a79a2802
No known key found for this signature in database
GPG Key ID: A3ADB67A2CDB8B35
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gnupg/gnupg.py
View File

@ -207,7 +207,7 @@ class GPG(object):
:func:parsers._sanitise. The ``passphrase`` argument needs to be True :func:parsers._sanitise. The ``passphrase`` argument needs to be True
if a passphrase will be sent to GPG, else False. if a passphrase will be sent to GPG, else False.
""" """
cmd = [self.gpgbinary, '--status-fd 2 --no-tty'] cmd = [self.gpgbinary, '--status-fd 2 --no-tty --no-emit-version']
if self.gpghome: if self.gpghome:
cmd.append('--homedir "%s"' % self.gpghome) cmd.append('--homedir "%s"' % self.gpghome)
if self.pubring: if self.pubring:

2
gnupg/parsers.py
View File

@ -287,7 +287,7 @@ def _is_allowed(input):
'--import', '--import',
'--export', '--export-secret-keys', '--export-secret-subkeys', '--export', '--export-secret-keys', '--export-secret-subkeys',
'--verify', '--verify',
'--version', '--output', '--version', '--no-emit-version', '--output',
'--status-fd', '--no-tty', '--passphrase-fd', '--status-fd', '--no-tty', '--passphrase-fd',
'--homedir', '--no-default-keyring', '--default-key', '--homedir', '--no-default-keyring', '--default-key',
'--keyring', '--secret-keyring', '--primary-keyring', '--keyring', '--secret-keyring', '--primary-keyring',

3
gnupg/tests/test_gnupg.py
View File

@ -49,7 +49,6 @@ def _make_tempfile(*args, **kwargs):
KEYS_TO_IMPORT = """-----BEGIN PGP PUBLIC KEY BLOCK----- KEYS_TO_IMPORT = """-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.9 (MingW32)
mQGiBEiH4QERBACm48JJsg2XGzWfL7f/fjp3wtrY+JIz6P07s7smr35kve+wl605 mQGiBEiH4QERBACm48JJsg2XGzWfL7f/fjp3wtrY+JIz6P07s7smr35kve+wl605
nqHtgjnIVpUVsbI9+xhIAPIkFIR6ZcQ7gRDhoT0bWKGkfdQ7YzXedVRPlQLdbpmR nqHtgjnIVpUVsbI9+xhIAPIkFIR6ZcQ7gRDhoT0bWKGkfdQ7YzXedVRPlQLdbpmR
@ -213,7 +212,7 @@ class GPGTestCase(unittest.TestCase):
self.gpg.keyring = self.secring self.gpg.keyring = self.secring
cmd = self.gpg._make_args(None, False) cmd = self.gpg._make_args(None, False)
expected = ['/usr/bin/gpg', expected = ['/usr/bin/gpg',
'--status-fd 2 --no-tty', '--status-fd 2 --no-tty --no-emit-version',
'--homedir "%s"' % HOME_DIR, '--homedir "%s"' % HOME_DIR,
'--no-default-keyring --keyring %s' % self.pubring, '--no-default-keyring --keyring %s' % self.pubring,
'--secret-keyring %s' % self.secring] '--secret-keyring %s' % self.secring]