tcleanup code in network.py - electrum - Electrum Bitcoin wallet HTML git clone https://git.parazyd.org/electrum DIR Log DIR Files DIR Refs DIR Submodules --- DIR commit c7694a87e7f2dc4a763a9823e77260b14a3da604 DIR parent 0bba8e454996dc2be287e48c7acfaf261ee08530 HTML Author: thomasv <thomasv@gitorious> Date: Mon, 16 Dec 2013 17:37:32 +0100 cleanup code in network.py Diffstat: M lib/network.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) --- DIR diff --git a/lib/network.py b/lib/network.py t@@ -94,12 +94,12 @@ class Network(threading.Thread): if message not in self.subscriptions[callback]: self.subscriptions[callback].append(message) - if self.interface and self.interface.is_connected: + if self.is_connected(): self.interface.send( messages, callback ) def send(self, messages, callback): - if self.interface and self.interface.is_connected: + if self.is_connected(): self.interface.send( messages, callback ) return True else: t@@ -162,14 +162,10 @@ class Network(threading.Thread): def start_interfaces(self): self.interface = self.start_interface(self.default_server) - #self.interface = self.interfaces[self.default_server] for i in range(self.num_server): self.start_random_interface() - if not self.interface: - self.interface = self.interfaces.values()[0] - def start(self, wait=False): self.start_interfaces() t@@ -180,9 +176,8 @@ class Network(threading.Thread): def wait_until_connected(self): - while not self.interface: + while not self.is_connected(): time.sleep(1) - self.interface.connect_event.wait() def set_parameters(self, host, port, protocol, proxy, auto_connect):