From 3e3d3871615e0f22eb5c72a1c16c1338e363ac45 Mon Sep 17 00:00:00 2001 From: SomberNight Date: Mon, 10 Sep 2018 15:18:11 +0200 Subject: [PATCH] fix kivy: follow-up 3d424077fd310b0644e7a466a813f4f411bd66ac --- electrum/gui/kivy/main_window.py | 2 +- electrum/gui/kivy/uix/dialogs/settings.py | 1 - electrum/gui/kivy/uix/ui_screens/server.kv | 3 +-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/electrum/gui/kivy/main_window.py b/electrum/gui/kivy/main_window.py index 4ba41465d..0ba85313d 100644 --- a/electrum/gui/kivy/main_window.py +++ b/electrum/gui/kivy/main_window.py @@ -272,7 +272,7 @@ class ElectrumWindow(App): self.server_host = net_params.host self.server_port = net_params.port self.auto_connect = net_params.auto_connect - self.proxy_config = net_params.proxy_config if net_params.proxy_config else {} + self.proxy_config = net_params.proxy if net_params.proxy else {} self.plugins = kwargs.get('plugins', []) self.gui_object = kwargs.get('gui_object', None) diff --git a/electrum/gui/kivy/uix/dialogs/settings.py b/electrum/gui/kivy/uix/dialogs/settings.py index 5247c0ffb..07530a0a7 100644 --- a/electrum/gui/kivy/uix/dialogs/settings.py +++ b/electrum/gui/kivy/uix/dialogs/settings.py @@ -8,7 +8,6 @@ from electrum.i18n import languages from electrum.gui.kivy.i18n import _ from electrum.plugin import run_hook from electrum import coinchooser -from electrum.network import NetworkProxy from .choice_dialog import ChoiceDialog diff --git a/electrum/gui/kivy/uix/ui_screens/server.kv b/electrum/gui/kivy/uix/ui_screens/server.kv index 686ee3be4..ee959cbab 100644 --- a/electrum/gui/kivy/uix/ui_screens/server.kv +++ b/electrum/gui/kivy/uix/ui_screens/server.kv @@ -57,7 +57,6 @@ Popup: text: _('OK') on_release: net_params = app.network.get_parameters() - net_params = net_params._replace(host=str(root.ids.host.text), - port=str(root.ids.port.text)) + net_params = net_params._replace(host=str(root.ids.host.text), port=str(root.ids.port.text)) app.network.set_parameters(net_params) nd.dismiss()