AaronFiore/electrum
1
0
Fork 0
Code Activity

Minor linter nits

Browse Source
This commit is contained in:
Harm Aarts
2018-06-01 14:03:22 +02:00
parent eb44ef327d
commit b1cd260aa9
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/network.py
View File

@@ -78,6 +78,7 @@ def parse_servers(result):
servers[host] = out servers[host] = out
return servers return servers
def filter_version(servers): def filter_version(servers):
def is_recent(version): def is_recent(version):
try: try:
@@ -97,12 +98,14 @@ def filter_protocol(hostmap, protocol = 's'):
eligible.append(serialize_server(host, port, protocol)) eligible.append(serialize_server(host, port, protocol))
return eligible return eligible
def pick_random_server(hostmap = None, protocol = 's', exclude_set = set()): def pick_random_server(hostmap = None, protocol = 's', exclude_set = set()):
if hostmap is None: if hostmap is None:
hostmap = constants.net.DEFAULT_SERVERS hostmap = constants.net.DEFAULT_SERVERS
eligible = list(set(filter_protocol(hostmap, protocol)) - exclude_set) eligible = list(set(filter_protocol(hostmap, protocol)) - exclude_set)
return random.choice(eligible) if eligible else None return random.choice(eligible) if eligible else None
from .simple_config import SimpleConfig from .simple_config import SimpleConfig
proxy_modes = ['socks4', 'socks5', 'http'] proxy_modes = ['socks4', 'socks5', 'http']
@@ -416,7 +419,7 @@ class Network(util.DaemonThread):
self.print_error("connecting to %s as new interface" % server) self.print_error("connecting to %s as new interface" % server)
self.set_status('connecting') self.set_status('connecting')
self.connecting.add(server) self.connecting.add(server)
c = Connection(server, self.socket_queue, self.config.path) Connection(server, self.socket_queue, self.config.path)
def start_random_interface(self): def start_random_interface(self):
with self.interface_lock: with self.interface_lock:
@@ -569,6 +572,7 @@ class Network(util.DaemonThread):
self.interface = None self.interface = None
self.start_interface(server) self.start_interface(server)
return return
i = self.interfaces[server] i = self.interfaces[server]
if self.interface != i: if self.interface != i:
self.print_error("switching to", server) self.print_error("switching to", server)
@@ -798,6 +802,7 @@ class Network(util.DaemonThread):
server, socket = self.socket_queue.get() server, socket = self.socket_queue.get()
if server in self.connecting: if server in self.connecting:
self.connecting.remove(server) self.connecting.remove(server)
if socket: if socket:
self.new_interface(server, socket) self.new_interface(server, socket)
else: else: