tTorDetector: minor clean-up - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit e7304ce23ec90340dc8d12905267fdbd92c2492d
DIR parent 8a4e307b7813e65a8182ed2420f46438e11d907d
HTML Author: SomberNight <somber.night@protonmail.com>
Date: Sat, 29 Jun 2019 04:03:29 +0200
TorDetector: minor clean-up
Diffstat:
M electrum/gui/qt/network_dialog.py | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
---
DIR diff --git a/electrum/gui/qt/network_dialog.py b/electrum/gui/qt/network_dialog.py
t@@ -26,6 +26,7 @@
import socket
import time
from enum import IntEnum
+from typing import Tuple
from PyQt5.QtCore import Qt, pyqtSignal, QThread
from PyQt5.QtWidgets import (QTreeWidget, QTreeWidgetItem, QMenu, QGridLayout, QComboBox,
t@@ -521,19 +522,20 @@ class TorDetector(QThread):
ports = [9050, 9150]
while True:
for p in ports:
- if TorDetector.is_tor_port(p):
- self.found_proxy.emit(("127.0.0.1", p))
+ net_addr = ("127.0.0.1", p)
+ if TorDetector.is_tor_port(net_addr):
+ self.found_proxy.emit(net_addr)
break
else:
self.found_proxy.emit(None)
time.sleep(10)
@staticmethod
- def is_tor_port(port):
+ def is_tor_port(net_addr: Tuple[str, int]) -> bool:
try:
- s = (socket._socketobject if hasattr(socket, "_socketobject") else socket.socket)(socket.AF_INET, socket.SOCK_STREAM)
+ s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
s.settimeout(0.1)
- s.connect(("127.0.0.1", port))
+ s.connect(net_addr)
# Tor responds uniquely to HTTP-like requests
s.send(b"GET\n")
if b"Tor is not an HTTP Proxy" in s.recv(1024):