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

@ -1224,7 +1224,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
menu.exec_(self.from_list.viewport().mapToGlobal(position))
def set_pay_from(self, coins):
self.pay_from = coins
self.pay_from = list(coins)
self.redraw_from_list()
def redraw_from_list(self):

View File

@ -470,7 +470,7 @@ class MyTreeWidget(QTreeWidget):
def on_edited(self, item, column, prior):
'''Called only when the text actually changes'''
key = str(item.data(0, Qt.UserRole).toString())
key = item.data(0, Qt.UserRole)
text = item.text(column)
self.parent.wallet.set_label(key, text)
self.parent.history_list.update_labels()

View File

@ -46,7 +46,7 @@ class ExchangeBase(PrintError):
def get_csv(self, site, get_string):
url = ''.join(['https://', site, get_string])
response = requests.request('GET', url, headers={'User-Agent' : 'Electrum'})
reader = csv.DictReader(response.content.split('\n'))
reader = csv.DictReader(response.content.decode().split('\n'))
return list(reader)
def name(self):

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]