tFix some bugs in last push - electrum - Electrum Bitcoin wallet (HTM) git clone https://git.parazyd.org/electrum (DIR) Log (DIR) Files (DIR) Refs (DIR) Submodules --- (DIR) commit 8d046c7919879f8a9be936f289f4dbf44a71632d (DIR) parent 08f1e56cef2cd49b2e0babfc0d23442cac4a1fdb (HTM) Author: Neil Booth <kyuupichan@gmail.com> Date: Sat, 5 Sep 2015 01:24:16 +0900 Fix some bugs in last push Diffstat: M plugins/exchange_rate.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) --- (DIR) diff --git a/plugins/exchange_rate.py b/plugins/exchange_rate.py t@@ -22,7 +22,7 @@ class ExchangeBase: headers={'User-Agent' : 'Electrum'}) return response.json() - def name(): + def name(self): return self.__class__.__name__ def update(self, ccy): t@@ -132,7 +132,7 @@ class LocalBitcoins(ExchangeBase): class Winkdex(ExchangeBase): def update(self, ccy): json = self.get_json('winkdex.com', '/api/v0/price') - return {'USD': Decimal(winkresp['price'] / 100.0)} + return {'USD': Decimal(json['price'] / 100.0)} def history_ccys(self): return ['USD'] t@@ -344,7 +344,7 @@ class Plugin(BasePlugin): window.history_list.setHeaderLabels([ '', '', _('Date'), _('Description') , _('Amount'), _('Balance'), _('Fiat Amount')] ) root = window.history_list.invisibleRootItem() childcount = root.childCount() - exchange = self.exchange.__class__.__name__ + exchange = self.exchange.name() for i in range(childcount): item = root.child(i) try: t@@ -403,7 +403,7 @@ class Plugin(BasePlugin): layout.addWidget(QLabel(_('History Rates: ')), 2, 0) combo = QComboBox() combo_ex = QComboBox() - combo_ex.addItems(self.exchanges.keys()) + combo_ex.addItems(sorted(self.exchanges.keys())) combo_ex.setCurrentIndex(combo_ex.findText(self.config_exchange())) hist_checkbox = QCheckBox() t@@ -425,9 +425,9 @@ class Plugin(BasePlugin): for window in self.parent.windows: window.update_status() - def on_change_ex(exchange): - exchange = str(exchange) - if exchange != self.exchange.__name__: + def on_change_ex(idx): + exchange = str(combo_ex.currentText()) + if exchange != self.exchange.name(): self.set_exchange(exchange) self.currencies = [] combo.clear()