From 69926d93357cc0ed7280586abee1e6871e0894cc Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Mon, 15 Feb 2021 17:53:39 +0100 Subject: examples: modem-watcher: get rid of global variables Move the code into the main() routine and pass main_loop as a parameter to the signal handler. --- examples/modem-watcher-python/modem-watcher-python | 25 ++++++++++++++-------- 1 file changed, 16 insertions(+), 9 deletions(-) (limited to 'examples/modem-watcher-python') diff --git a/examples/modem-watcher-python/modem-watcher-python b/examples/modem-watcher-python/modem-watcher-python index 4884beef..f7dd1fc6 100755 --- a/examples/modem-watcher-python/modem-watcher-python +++ b/examples/modem-watcher-python/modem-watcher-python @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- # # This program is free software; you can redistribute it and/or modify it under @@ -24,21 +24,28 @@ from gi.repository import GLib import ModemWatcher -main_loop = None -watcher = None -def signal_handler(data): - main_loop.quit() +def signal_handler(loop): + """SIGHUP and SIGINT handler.""" + loop.quit() -if __name__ == "__main__": + +def main(): + """Main routine.""" # Create modem watcher - watcher = ModemWatcher.ModemWatcher() + ModemWatcher.ModemWatcher() # Main loop main_loop = GLib.MainLoop() - GLib.unix_signal_add(GLib.PRIORITY_HIGH, signal.SIGHUP, signal_handler, None) - GLib.unix_signal_add(GLib.PRIORITY_HIGH, signal.SIGTERM, signal_handler, None) + GLib.unix_signal_add( + GLib.PRIORITY_HIGH, signal.SIGHUP, signal_handler, main_loop) + GLib.unix_signal_add( + GLib.PRIORITY_HIGH, signal.SIGTERM, signal_handler, main_loop) try: main_loop.run() except KeyboardInterrupt: pass + + +if __name__ == "__main__": + main() -- cgit v1.2.3-70-g09d2