From d44e155d1ca56bb0d35d2538f1eb50d7a635af3a Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Wed, 21 Sep 2022 21:12:51 -0400 Subject: [PATCH] bin/djbdns-logparse: avoid clobbering exit() with sys.exit(). --- bin/djbdns-logparse | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/bin/djbdns-logparse b/bin/djbdns-logparse index 218801d..2c88462 100755 --- a/bin/djbdns-logparse +++ b/bin/djbdns-logparse @@ -2,8 +2,10 @@ r""" Convert tinydns and dnscache logs to human-readable form """ +# Avoid clobbering the top-level exit() built-in. +import sys + from signal import signal, SIGINT -from sys import exit, stdin from argparse import ArgumentParser, FileType from djbdns.io import parse_logfile @@ -17,7 +19,7 @@ parser.add_argument("logfiles", metavar="LOGFILE", type=FileType("r"), nargs="*", - default=[stdin], + default=[sys.stdin], help="djbdns logfile to process (default: stdin)") # Warning: argparse automatically opens its file arguments here, @@ -34,7 +36,7 @@ args = parser.parse_args() # Install a SIGINT handler so thst we don't spit out a stack trace when # the user accidentally starts the program with no arguments and then # hits Ctrl-C to kill it. -signal(SIGINT, lambda s,f: exit(0)) +signal(SIGINT, lambda s,f: sys.exit(0)) for f in args.logfiles: parse_logfile(f) -- 2.44.2