From 23268279f2e36ead00de93724e5ac5d8dba6194f Mon Sep 17 00:00:00 2001 From: yenatch Date: Sat, 7 Dec 2013 19:58:30 -0500 Subject: prequeue: less wasteful stdout rerouting --- preprocessor.py | 4 +++- prequeue.py | 13 ++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/preprocessor.py b/preprocessor.py index 317a2fe6..cb9353af 100644 --- a/preprocessor.py +++ b/preprocessor.py @@ -279,7 +279,9 @@ def setup_processor(): def main(): processor = setup_processor() - processor.preprocess() + output = processor.preprocess() + processor.update_globals() + return output if __name__ == '__main__': main() diff --git a/prequeue.py b/prequeue.py index 6ad16d2c..00bcee36 100644 --- a/prequeue.py +++ b/prequeue.py @@ -13,17 +13,20 @@ import preprocessor def main(): processor = preprocessor.setup_processor() + stdin = sys.stdin + stdout = sys.stdout + for source in sys.argv[1:]: dest = os.path.splitext(source)[0] + '.tx' - - stdout = sys.stdout - sys.stdin = open(source, 'r') sys.stdout = open(dest, 'w') - processor.preprocess() - sys.stdout = stdout + processor.update_globals() + + sys.stdin = stdin + sys.stdout = stdout + if __name__ == '__main__': main() -- cgit v1.2.3