From b7b7b2100cb54b129567ff641b44e110bccbbd99 Mon Sep 17 00:00:00 2001
From: Donald Stufft <donald@stufft.io>
Date: Sun, 24 Feb 2013 21:03:44 -0500
Subject: [PATCH] Properly handle bytes <-> str for Python 3
---
tests/test_signing.py | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/tests/test_signing.py b/tests/test_signing.py
index b8c50ac9..fe57c970 100644
--- a/tests/test_signing.py
+++ b/tests/test_signing.py
@@ -1,6 +1,7 @@
from __future__ import division
import binascii
+import codecs
import os
import pytest
@@ -14,15 +15,15 @@ def ed25519_known_answers():
answers = []
path = os.path.join(os.path.dirname(__file__), "data", "ed25519")
- with open(path, "r") as fp:
+ with codecs.open(path, "r", encoding="utf-8") as fp:
for line in fp:
x = line.split(":")
answers.append({
- "seed": x[0][0:64],
- "public_key": x[1],
- "message": x[2],
- "signed": x[3],
- "signature": binascii.hexlify(binascii.unhexlify(x[3])[:64]),
+ "seed": x[0][0:64].encode("ascii"),
+ "public_key": x[1].encode("ascii"),
+ "message": x[2].encode("ascii"),
+ "signed": x[3].encode("ascii"),
+ "signature": binascii.hexlify(binascii.unhexlify(x[3].encode("ascii"))[:64]),
})
return answers
@@ -68,8 +69,8 @@ class TestVerifyKey:
def test_invalid_signed_message(self):
skey = nacl.signing.SigningKey.generate()
- smessage = skey.sign("A Test Message!")
- signature, message = smessage.signature, "A Forged Test Message!"
+ smessage = skey.sign(b"A Test Message!")
+ signature, message = smessage.signature, b"A Forged Test Message!"
# Small sanity check
assert skey.verify_key.verify(smessage)
--
GitLab