diff options
| author | Justus Winter <[email protected]> | 2016-09-13 08:44:14 +0000 |
|---|---|---|
| committer | Justus Winter <[email protected]> | 2016-09-13 11:29:43 +0000 |
| commit | 70a3be27a509a1b5ea7372bee93d83c5019427ff (patch) | |
| tree | 26424006293c90a51baec2276c633850fa2f539b /lang/python/tests/t-encrypt-large.py | |
| parent | python: Fix types and error handling. (diff) | |
| download | gpgme-70a3be27a509a1b5ea7372bee93d83c5019427ff.tar.gz gpgme-70a3be27a509a1b5ea7372bee93d83c5019427ff.zip | |
python: Handle slight differences between Python 2 and 3.
* lang/python/helpers.c (pyDataWriteCb): Handle Python integers being
returned on Python 2.
(pyDataSeekCb): Likewise.
* lang/python/pyme/core.py (Data.__init__): Fix testing for string
argument.
(Data.new_from_filepart): Likewise.
* lang/python/pyme/util.py (is_a_string): New function.
* lang/python/tests/t-encrypt-large.py (read_cb): Force evaluation of
generator.
* lang/python/tests/t-idiomatic.py: Partly skip test on Python 2.
* lang/python/tests/t-verify.py (check_result): Here, the difference
between 2 and 3 really matters. We cannot change the char *
conversion in Python 2 without breaking all existing applications, and
using bytestrings in Python 3 would be very inconvenient.
Signed-off-by: Justus Winter <[email protected]>
Diffstat (limited to '')
| -rwxr-xr-x | lang/python/tests/t-encrypt-large.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lang/python/tests/t-encrypt-large.py b/lang/python/tests/t-encrypt-large.py index 69aed483..29f9de21 100755 --- a/lang/python/tests/t-encrypt-large.py +++ b/lang/python/tests/t-encrypt-large.py @@ -37,7 +37,7 @@ def read_cb(amount): ntoread -= chunk assert ntoread >= 0 assert chunk >= 0 - return bytes(random.randrange(256) for i in range(chunk)) + return bytes(bytearray(random.randrange(256) for i in range(chunk))) nwritten = 0 def write_cb(data): |