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/pyme/core.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 'lang/python/pyme/core.py')
| -rw-r--r-- | lang/python/pyme/core.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lang/python/pyme/core.py b/lang/python/pyme/core.py index 4bbbc170..a71426b9 100644 --- a/lang/python/pyme/core.py +++ b/lang/python/pyme/core.py @@ -884,7 +884,7 @@ class Data(GpgmeWrapper): elif file != None and offset != None and length != None: self.new_from_filepart(file, offset, length) elif file != None: - if type(file) == type("x"): + if util.is_a_string(file): self.new_from_file(file, copy) else: self.new_from_fd(file) @@ -961,7 +961,7 @@ class Data(GpgmeWrapper): filename = None fp = None - if type(file) == type("x"): + if util.is_a_string(file): filename = file else: fp = gpgme.fdopen(file.fileno(), file.mode) |