aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen McGinnes <[email protected]>2015-05-16 19:07:12 +0000
committerBen McGinnes <[email protected]>2015-05-16 19:07:12 +0000
commitc39cea7a07cec9ab34cd2026f47b6fba80fea3c8 (patch)
tree904d65a0b28187cc4826a0e139562ff57133952b
parentNo change, note added to explain why. (diff)
downloadgpgme-c39cea7a07cec9ab34cd2026f47b6fba80fea3c8.tar.gz
gpgme-c39cea7a07cec9ab34cd2026f47b6fba80fea3c8.zip
Byte encoding
* More string updates. * verifydetails.py still fails, but as Bernhard is still contactable, it might be worth him checking on it instead.
-rwxr-xr-xlang/py3-pyme/examples/sign.py4
-rwxr-xr-xlang/py3-pyme/examples/signverify.py6
-rw-r--r--lang/py3-pyme/examples/t-edit.py2
-rwxr-xr-xlang/py3-pyme/examples/verifydetails.py8
4 files changed, 10 insertions, 10 deletions
diff --git a/lang/py3-pyme/examples/sign.py b/lang/py3-pyme/examples/sign.py
index a0572fcc..5667cc2b 100755
--- a/lang/py3-pyme/examples/sign.py
+++ b/lang/py3-pyme/examples/sign.py
@@ -22,10 +22,10 @@ from pyme.constants.sig import mode
core.check_version(None)
-plain = core.Data("Test message")
+plain = core.Data(b"Test message")
sig = core.Data()
c = core.Context()
-c.set_passphrase_cb(callbacks.passphrase_stdin, 'for signing')
+c.set_passphrase_cb(callbacks.passphrase_stdin, b'for signing')
c.op_sign(plain, sig, mode.CLEAR)
sig.seek(0,0)
print(sig.read())
diff --git a/lang/py3-pyme/examples/signverify.py b/lang/py3-pyme/examples/signverify.py
index e2f80357..f8804ca9 100755
--- a/lang/py3-pyme/examples/signverify.py
+++ b/lang/py3-pyme/examples/signverify.py
@@ -25,10 +25,10 @@ from pyme.constants.sig import mode
core.check_version(None)
-plain = core.Data("Test message")
+plain = core.Data(b"Test message")
sig = core.Data()
c = core.Context()
c.signers_clear()
# Add [email protected]'s keys in the list of signers
@@ -41,7 +41,7 @@ if not c.signers_enum(0):
# This is a map between signer e-mail and its password
passlist = {
- "<[email protected]>": "Crypt0R0cks"
+ b"<[email protected]>": b"Crypt0R0cks"
}
# callback will return password based on the e-mail listed in the hint.
diff --git a/lang/py3-pyme/examples/t-edit.py b/lang/py3-pyme/examples/t-edit.py
index 24d36d32..6c533429 100644
--- a/lang/py3-pyme/examples/t-edit.py
+++ b/lang/py3-pyme/examples/t-edit.py
@@ -51,7 +51,7 @@ else:
c = Context()
c.set_passphrase_cb(lambda x,y,z: "abc")
out = Data()
- c.op_keylist_start("Alpha", 0)
+ c.op_keylist_start(b"Alpha", 0)
key = c.op_keylist_next()
c.op_edit(key, KeyEditor().edit_fnc, out, out)
print("[-- Last response --]")
diff --git a/lang/py3-pyme/examples/verifydetails.py b/lang/py3-pyme/examples/verifydetails.py
index 8784487e..0d47ba54 100755
--- a/lang/py3-pyme/examples/verifydetails.py
+++ b/lang/py3-pyme/examples/verifydetails.py
@@ -86,13 +86,13 @@ def main():
sys.exit(1)
if argc == 2:
- print("trying to verify file: " + sys.argv[1])
- verifyprintdetails(sys.argv[1])
+ print("trying to verify file: " + sys.argv[1].encode('utf-8'))
+ verifyprintdetails(sys.argv[1].encode('utf-8'))
if argc == 3:
print("trying to verify signature %s for file %s" \
- % (sys.argv[1], sys.argv[2]))
+ % (sys.argv[1].encode('utf-8'), sys.argv[2].encode('utf-8')))
- verifyprintdetails(sys.argv[1], sys.argv[2])
+ verifyprintdetails(sys.argv[1].encode('utf-8'), sys.argv[2].encode('utf-8'))
if __name__ == "__main__":
main()