1
0

misc. fixes for python3

This commit is contained in:
ThomasV
2017-02-19 15:52:22 +01:00
parent 4f516dc08e
commit f1a8c0b0e6
5 changed files with 5 additions and 5 deletions

View File

@@ -57,7 +57,7 @@ class Plugin(BasePlugin):
self.modem_config = amodem.config.bitrates[bitrate]
combo = QComboBox()
combo.addItems(map(str, bitrates))
combo.addItems([str(x) for x in bitrates])
combo.currentIndexChanged.connect(_index_changed)
layout.addWidget(combo, 0, 1)

View File

@@ -23,7 +23,7 @@ class LabelsPlugin(BasePlugin):
password, iv, wallet_id = self.wallets[wallet]
encrypted = electrum.bitcoin.aes_encrypt_with_iv(password, iv,
msg.encode('utf8'))
return base64.b64encode(encrypted)
return base64.b64encode(encrypted).decode()
def decode(self, wallet, message):
password, iv, wallet_id = self.wallets[wallet]