From 9ee136fc12d62561fac5d9287d3a536d4feeaf76 Mon Sep 17 00:00:00 2001
From: Inso <insomniak.fr@gmail.com>
Date: Thu, 22 May 2014 14:35:26 +0200
Subject: [PATCH] Small bugfix
---
README.md | 1 -
src/cutecoin/gui/mainWindow.py | 4 ++++
src/cutecoin/models/wallet/__init__.py | 14 +++++++-------
3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/README.md b/README.md
index 3db0ac26..500b61f0 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,6 @@ Qt Client for [Ucoin](http://www.ucoin.io) project.
### Todo
* Joining a community, publishing keys
* Multiple wallets management
- * More user-friendly coins transfer
* Cutecoin keyring
### How to install
diff --git a/src/cutecoin/gui/mainWindow.py b/src/cutecoin/gui/mainWindow.py
index 6875c92d..88b356e6 100644
--- a/src/cutecoin/gui/mainWindow.py
+++ b/src/cutecoin/gui/mainWindow.py
@@ -79,8 +79,12 @@ class MainWindow(QMainWindow, Ui_MainWindow):
if self.core.current_account is None:
self.tabs_account.setEnabled(False)
+ self.menu_contacts.setEnabled(False)
+ self.menu_actions.setEnabled(False)
else:
self.tabs_account.setEnabled(True)
+ self.menu_contacts.setEnabled(True)
+ self.menu_actions.setEnabled(True)
self.label_account_name.setText(
"Current account : " +
self.core.current_account.name)
diff --git a/src/cutecoin/models/wallet/__init__.py b/src/cutecoin/models/wallet/__init__.py
index bcbf1364..3112b513 100644
--- a/src/cutecoin/models/wallet/__init__.py
+++ b/src/cutecoin/models/wallet/__init__.py
@@ -85,7 +85,11 @@ class Wallet(object):
server=self.trusts()[0].server,
port=self.trusts()[0].port)
- wht_request = ucoin.network.Wallet(recipient.fingerprint)
+ try:
+ wht_request = ucoin.network.Wallet(recipient.fingerprint)
+ except ValueError as e:
+ return str(e)
+
recipient_wht = self.request(wht_request)
nodes = self.get_nodes_in_peering(recipient_wht['entry']['trusts'])
nodes += [h for h in self.hosters() if h not in nodes]
@@ -195,18 +199,15 @@ Hosters:
return nodes
def request(self, request, get_args={}):
- error = None
for node in self.trusts():
logging.debug("Trying to connect to : " + node.get_text())
node.use(request)
try:
data = request.get(**get_args)
return data
- except ValueError as e:
- error = str(e)
except:
continue
- return error
+ return None
def post(self, request, get_args={}):
error = None
@@ -214,12 +215,11 @@ Hosters:
logging.debug("Trying to connect to : " + node.get_text())
node.use(request)
try:
- data = request.post(**get_args)
+ request.post(**get_args)
except ValueError as e:
error = str(e)
except:
continue
- return data
return error
def broadcast(self, nodes, request, get_args={}):
--
GitLab