looks nicer (though --tor is implicitly converted into --proxy)

This commit is contained in:
Miroslav Stampar 2011-06-24 19:00:53 +00:00
parent aa83fe5c66
commit c4cb367e65

View File

@ -868,7 +868,7 @@ def checkNullConnection():
return kb.nullConnection is not None return kb.nullConnection is not None
def checkConnection(suppressOutput=False): def checkConnection(suppressOutput=False):
if not conf.proxy: if not any([conf.proxy, conf.tor]):
try: try:
socket.getaddrinfo(conf.hostname, None) socket.getaddrinfo(conf.hostname, None)
except socket.gaierror: except socket.gaierror: