port to python3

This commit is contained in:
j 2014-09-03 00:32:44 +02:00
commit 8e27b9f76e
51 changed files with 272 additions and 248 deletions

View file

@ -1,13 +1,14 @@
# -*- coding: utf-8 -*-
# vi:si:et:sw=4:sts=4:ts=4
# DHT placeholder
from __future__ import division
import logging
import requests
import ed25519
import json
import settings
logger = logging.getLogger('oml.directory')
@ -27,7 +28,7 @@ def get(vk):
vk = ed25519.VerifyingKey(id, encoding='base64')
try:
vk.verify(sig, data, encoding='base64')
data = json.loads(data)
data = json.loads(data.decode('utf-8'))
except ed25519.BadSignatureError:
logger.debug('invalid signature')
@ -36,7 +37,7 @@ def get(vk):
def put(sk, data):
id = sk.get_verifying_key().to_ascii(encoding='base64')
data = json.dumps(data)
data = json.dumps(data).encode('utf-8')
sig = sk.sign(data, encoding='base64')
url ='%s/%s' % (base, id)
headers = {