From 2656fd78a4550a3fa3285a9d0ad4d2c7f83bbf06 Mon Sep 17 00:00:00 2001 From: Neil Booth Date: Sun, 2 Apr 2017 21:25:02 +0900 Subject: [PATCH] Clarify that we may not have a clearnet peer --- server/peers.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/server/peers.py b/server/peers.py index ac1ff33..db19f32 100644 --- a/server/peers.py +++ b/server/peers.py @@ -173,7 +173,7 @@ class PeerSession(JSONSession): if self.peer in self.peer_mgr.myselves: return my = self.peer_mgr.my_clearnet_peer() - if not my.is_public: + if not my or not my.is_public: return for peer in my.matches(peers): if peer.tcp_port == my.tcp_port and peer.ssl_port == my.ssl_port: @@ -227,8 +227,9 @@ class PeerManager(util.LoggedClass): self.import_peers() def my_clearnet_peer(self): - '''Returns the clearnet peer representing this server.''' - return [peer for peer in self.myselves if not peer.is_tor][0] + '''Returns the clearnet peer representing this server, if any.''' + clearnet = [peer for peer in self.myselves if not peer.is_tor] + return clearnet[0] if clearnet else None def info(self): '''The number of peers.'''