exit the pythonic way

This commit is contained in:
Babak Farrokhi 2016-05-09 13:33:32 +04:30
parent 6715741f66
commit b2dab7affc
Signed by: farrokhi
GPG Key ID: 6B267AD85D632E9A

View File

@ -115,13 +115,13 @@ def usage():
print(' -t --type DNS request record type (default: A)') print(' -t --type DNS request record type (default: A)')
print(' -C --color Print colorful output') print(' -C --color Print colorful output')
print(' ') print(' ')
exit() sys.exit()
def signal_handler(sig, frame): def signal_handler(sig, frame):
global shutdown global shutdown
if shutdown: # pressed twice, so exit immediately if shutdown: # pressed twice, so exit immediately
exit(0) sys.exit(0)
shutdown = True # pressed once, exit gracefully shutdown = True # pressed once, exit gracefully
@ -166,11 +166,11 @@ def ping(resolver, hostname, dnsrecord, ttl):
except dns.resolver.NoNameservers as e: except dns.resolver.NoNameservers as e:
if not quiet: if not quiet:
print("no or bad response:", e) print("no or bad response:", e)
exit(1) sys.exit(1)
except dns.resolver.NXDOMAIN as e: except dns.resolver.NXDOMAIN as e:
if not quiet: if not quiet:
print("Invalid hostname:", e) print("Invalid hostname:", e)
exit(1) sys.exit(1)
except dns.resolver.Timeout: except dns.resolver.Timeout:
pass pass
except dns.resolver.NoAnswer: except dns.resolver.NoAnswer:
@ -181,7 +181,7 @@ def ping(resolver, hostname, dnsrecord, ttl):
pass pass
except: except:
print("unxpected error: ", sys.exc_info()[0]) print("unxpected error: ", sys.exc_info()[0])
exit(1) sys.exit(1)
else: else:
reached = True reached = True
@ -282,7 +282,7 @@ def main():
icmp_socket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM, icmp) icmp_socket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM, icmp)
except OSError: except OSError:
print("Error: Unable to create ICMP socket with unprivileged user. Please run as root.") print("Error: Unable to create ICMP socket with unprivileged user. Please run as root.")
exit(1) sys.exit(1)
icmp_socket.bind(("", dest_port)) icmp_socket.bind(("", dest_port))
icmp_socket.settimeout(timeout) icmp_socket.settimeout(timeout)
@ -337,7 +337,7 @@ def main():
as_name = "[%s %s] " % (ASN.asn, ASN.owner) as_name = "[%s %s] " % (ASN.asn, ASN.owner)
except AttributeError: except AttributeError:
if shutdown: if shutdown:
exit(0) sys.exit(0)
pass pass
c = color.N # default c = color.N # default