open.source/magic-wormhole
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

u"" cleanup on util.py and codes.py

Browse Source
This commit is contained in:
laharah 2016-06-04 13:06:27 -07:00
parent 2c25b4d97d
commit 64f7348d05
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wormhole/codes.py
View File

@ -4,7 +4,7 @@ from .wordlist import (byte_to_even_word, byte_to_odd_word,
even_words_lowercase, odd_words_lowercase) even_words_lowercase, odd_words_lowercase)
def make_code(channel_id, code_length): def make_code(channel_id, code_length):
assert isinstance(channel_id, type(u"")), type(channel_id) assert isinstance(channel_id, type("")), type(channel_id)
words = [] words = []
for i in range(code_length): for i in range(code_length):
# we start with an "odd word" # we start with an "odd word"
@ -12,7 +12,7 @@ def make_code(channel_id, code_length):
words.append(byte_to_odd_word[os.urandom(1)].lower()) words.append(byte_to_odd_word[os.urandom(1)].lower())
else: else:
words.append(byte_to_even_word[os.urandom(1)].lower()) words.append(byte_to_even_word[os.urandom(1)].lower())
return u"%s-%s" % (channel_id, u"-".join(words)) return "%s-%s" % (channel_id, "-".join(words))
def extract_channel_id(code): def extract_channel_id(code):
channel_id = int(code.split("-")[0]) channel_id = int(code.split("-")[0])

1
src/wormhole/util.py
View File

@ -1,3 +1,4 @@
# No unicode_literals
import json, unicodedata import json, unicodedata
from binascii import hexlify, unhexlify from binascii import hexlify, unhexlify