1
0

python3: remove calls to unicode function

This commit is contained in:
ThomasV
2017-08-08 11:12:44 +02:00
parent 033a5c6c91
commit 15642ec8de
5 changed files with 7 additions and 16 deletions

View File

@@ -86,10 +86,7 @@ def is_CJK(c):
def normalize_text(seed):
# normalize
if six.PY2:
seed = unicodedata.normalize('NFKD', unicode(seed))
else:
seed = unicodedata.normalize('NFKD', str(seed))
seed = unicodedata.normalize('NFKD', str(seed))
# lower
seed = seed.lower()
# remove accents

View File

@@ -85,12 +85,6 @@ class WalletStorage(PrintError):
except Exception as e:
raise IOError("Cannot read wallet file '%s'" % self.path)
self.data = {}
# In old versions of Electrum labels were latin1 encoded, this fixes breakage.
for i, label in labels.items():
try:
unicode(label)
except UnicodeDecodeError:
d['labels'][i] = unicode(label.decode('latin1'))
for key, value in d.items():
try:
json.dumps(key)

View File

@@ -114,7 +114,7 @@ class WsClientThread(util.DaemonThread):
for ws, amount in l:
if not ws.closed:
if sum(result.values()) >=amount:
ws.sendMessage(unicode('paid'))
ws.sendMessage('paid')