From d6ef752152ad7026e99e3b4ee578a0c44c03655c Mon Sep 17 00:00:00 2001 From: Brian Warner Date: Sun, 15 Feb 2015 09:32:19 -0800 Subject: [PATCH] update code to match rearranged source tree --- bin/receive_text.py | 2 +- bin/send_text.py | 2 +- src/wormhole/blocking/transcribe.py | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/receive_text.py b/bin/receive_text.py index b8b25d6..3a3a712 100644 --- a/bin/receive_text.py +++ b/bin/receive_text.py @@ -1,6 +1,6 @@ from __future__ import print_function import time, json -from wormhole.transcribe import Receiver +from wormhole.blocking.transcribe import Receiver from wormhole.codes import input_code_with_completion APPID = "lothar.com/wormhole/text-xfer" diff --git a/bin/send_text.py b/bin/send_text.py index 2d99d8d..891fa1f 100644 --- a/bin/send_text.py +++ b/bin/send_text.py @@ -1,6 +1,6 @@ from __future__ import print_function import sys, json -from wormhole.transcribe import Initiator +from wormhole.blocking.transcribe import Initiator APPID = "lothar.com/wormhole/text-xfer" diff --git a/src/wormhole/blocking/transcribe.py b/src/wormhole/blocking/transcribe.py index d20a8d0..aa019a3 100644 --- a/src/wormhole/blocking/transcribe.py +++ b/src/wormhole/blocking/transcribe.py @@ -3,9 +3,9 @@ from binascii import hexlify, unhexlify from spake2 import SPAKE2_A, SPAKE2_B from nacl.secret import SecretBox from nacl import utils -from . import codes -from .hkdf import HKDF -from .const import RELAY +from .. import codes +from ..util.hkdf import HKDF +from ..const import RELAY SECOND = 1 MINUTE = 60*SECOND