AaronFiore/electrum
1
0
Fork 0
Code Activity

fix unicode in make_seed and getseed

Browse Source
This commit is contained in:
ThomasV
2017-08-27 09:53:22 +02:00
parent 8cb714fb70
commit 7b14516cc0
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/commands.py
View File

@@ -164,9 +164,9 @@ class Commands:
@command('') @command('')
def make_seed(self, nbits=132, entropy=1, language=None): def make_seed(self, nbits=132, entropy=1, language=None):
"""Create a seed""" """Create a seed"""
from mnemonic import Mnemonic from .mnemonic import Mnemonic
s = Mnemonic(language).make_seed('standard', nbits, custom_entropy=entropy) s = Mnemonic(language).make_seed('standard', nbits, custom_entropy=entropy)
return s.encode('utf8') return s
@command('') @command('')
def check_seed(self, seed, entropy=1, language=None): def check_seed(self, seed, entropy=1, language=None):
@@ -369,7 +369,7 @@ class Commands:
def getseed(self, password=None): def getseed(self, password=None):
"""Get seed phrase. Print the generation seed of your wallet.""" """Get seed phrase. Print the generation seed of your wallet."""
s = self.wallet.get_seed(password) s = self.wallet.get_seed(password)
return s.encode('utf8') return s
@command('wp') @command('wp')
def importprivkey(self, privkey, password=None): def importprivkey(self, privkey, password=None):

4
lib/mnemonic.py
View File

@@ -86,7 +86,7 @@ def is_CJK(c):
def normalize_text(seed): def normalize_text(seed):
# normalize # normalize
seed = unicodedata.normalize('NFKD', str(seed)) seed = unicodedata.normalize('NFKD', seed)
# lower # lower
seed = seed.lower() seed = seed.lower()
# remove accents # remove accents
@@ -100,7 +100,7 @@ def normalize_text(seed):
def load_wordlist(filename): def load_wordlist(filename):
path = os.path.join(os.path.dirname(__file__), 'wordlist', filename) path = os.path.join(os.path.dirname(__file__), 'wordlist', filename)
s = open(path,'r').read().strip() s = open(path,'r').read().strip()
s = unicodedata.normalize('NFKD', s.decode('utf8')) s = unicodedata.normalize('NFKD', s)
lines = s.split('\n') lines = s.split('\n')
wordlist = [] wordlist = []
for line in lines: for line in lines: