From 096db19a9a465cc667aa5d0ef92df2eeac5955b2 Mon Sep 17 00:00:00 2001 From: Michael Schwarz Date: Fri, 11 Sep 2015 21:55:58 +0200 Subject: Wrap all Python main functions with decorator. This decorator check if a module was called as the main module and catches exceptions. --- support/openscad/__main__.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'support/openscad') diff --git a/support/openscad/__main__.py b/support/openscad/__main__.py index 28de2cf..0eae27e 100644 --- a/support/openscad/__main__.py +++ b/support/openscad/__main__.py @@ -1,4 +1,4 @@ -import os, sys +import os from lib import util @@ -10,6 +10,7 @@ def _write_dependencies(path, target, dependencies): util.write_file(path, '{}: {}\n'.format(target, ' '.join(dependencies)).encode()) +@util.main def main(in_path, out_path, deps_path): cwd = os.getcwd() @@ -43,12 +44,3 @@ def main(in_path, out_path, deps_path): # Write output files. _write_dependencies(deps_path, relpath(out_path), deps - ignored_files) util.rename_atomic(temp_out_path, out_path) - - -try: - main(*sys.argv[1:]) -except util.UserError as e: - print 'Error:', e - sys.exit(1) -except KeyboardInterrupt: - sys.exit(2) -- cgit