diff options
| author | Justus Winter <[email protected]> | 2017-02-17 11:10:34 +0000 |
|---|---|---|
| committer | Justus Winter <[email protected]> | 2017-02-17 11:10:34 +0000 |
| commit | 9350168a1eed3f055040d7cc8a9bf4cdf745b23a (patch) | |
| tree | e6f169df44139b8b62c4160dda92ae16ca222c80 | |
| parent | python: Support adding and revoking UIDs. (diff) | |
| download | gpgme-9350168a1eed3f055040d7cc8a9bf4cdf745b23a.tar.gz gpgme-9350168a1eed3f055040d7cc8a9bf4cdf745b23a.zip | |
python: Fix using strings as commands in the assuan protocol.
* lang/python/gpg/core.py (Context.assuan_transact): Fix testing
whether the command is a string on Python2.
* lang/python/tests/t-protocol-assuan.py: Improve the test to detect
this problem.
Signed-off-by: Justus Winter <[email protected]>
| -rw-r--r-- | lang/python/gpg/core.py | 2 | ||||
| -rwxr-xr-x | lang/python/tests/t-protocol-assuan.py | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/lang/python/gpg/core.py b/lang/python/gpg/core.py index beaebda2..28d4629e 100644 --- a/lang/python/gpg/core.py +++ b/lang/python/gpg/core.py @@ -699,7 +699,7 @@ class Context(GpgmeWrapper): """ - if isinstance(command, (str, bytes)): + if util.is_a_string(command) or isinstance(command, bytes): cmd = command else: cmd = " ".join(util.percent_escape(f) for f in command) diff --git a/lang/python/tests/t-protocol-assuan.py b/lang/python/tests/t-protocol-assuan.py index 0084a6bd..27b28c72 100755 --- a/lang/python/tests/t-protocol-assuan.py +++ b/lang/python/tests/t-protocol-assuan.py @@ -24,9 +24,12 @@ import gpg with gpg.Context(protocol=gpg.constants.protocol.ASSUAN) as c: # Do nothing. - c.assuan_transact('nop') - c.assuan_transact('NOP') - c.assuan_transact(['NOP']) + err = c.assuan_transact('nop') + assert err == None + err = c.assuan_transact(b'NOP') + assert err == None + err = c.assuan_transact(['NOP']) + assert err == None err = c.assuan_transact('idontexist') assert err.getsource() == gpg.errors.SOURCE_GPGAGENT |