From b8ad27d039282ea11af31b14995640a53b4e0a66 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Fri, 25 Nov 2016 11:59:52 +0100 Subject: Fix a ResourceWarning in generate_opcode_h.py Use a context manager to close the Python file. Replace also open() with tokenize.open() to handle coding cookie if any in Lib/opcode.py. --- Tools/scripts/generate_opcode_h.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'Tools/scripts/generate_opcode_h.py') diff --git a/Tools/scripts/generate_opcode_h.py b/Tools/scripts/generate_opcode_h.py index 948b56f900..bbc3aab553 100644 --- a/Tools/scripts/generate_opcode_h.py +++ b/Tools/scripts/generate_opcode_h.py @@ -32,10 +32,14 @@ enum cmp_op {PyCmp_LT=Py_LT, PyCmp_LE=Py_LE, PyCmp_EQ=Py_EQ, PyCmp_NE=Py_NE, #endif /* !Py_OPCODE_H */ """ +import tokenize + def main(opcode_py, outfile='Include/opcode.h'): opcode = {} - exec(open(opcode_py).read(), opcode) + with tokenize.open(opcode_py) as fp: + code = fp.read() + exec(code, opcode) opmap = opcode['opmap'] with open(outfile, 'w') as fobj: fobj.write(header) -- cgit v1.2.1 From e6e6fa8231b3e0cb8de20c3bc4625ef1d5f775de Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Mon, 28 Nov 2016 18:13:52 +0100 Subject: Reintroduce Python2 support in generate_opcode_h.py Issue #28821. Add also a message to show that the command did something :-) --- Tools/scripts/generate_opcode_h.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'Tools/scripts/generate_opcode_h.py') diff --git a/Tools/scripts/generate_opcode_h.py b/Tools/scripts/generate_opcode_h.py index bbc3aab553..6622a3c815 100644 --- a/Tools/scripts/generate_opcode_h.py +++ b/Tools/scripts/generate_opcode_h.py @@ -1,6 +1,8 @@ # This script generates the opcode.h header file. import sys +import tokenize + header = """/* Auto-generated by Tools/scripts/generate_opcode_h.py */ #ifndef Py_OPCODE_H #define Py_OPCODE_H @@ -32,12 +34,14 @@ enum cmp_op {PyCmp_LT=Py_LT, PyCmp_LE=Py_LE, PyCmp_EQ=Py_EQ, PyCmp_NE=Py_NE, #endif /* !Py_OPCODE_H */ """ -import tokenize - def main(opcode_py, outfile='Include/opcode.h'): opcode = {} - with tokenize.open(opcode_py) as fp: + if hasattr(tokenize, 'open'): + fp = tokenize.open(opcode_py) # Python 3.2+ + else: + fp = open(opcode_py) # Python 2.7 + with fp: code = fp.read() exec(code, opcode) opmap = opcode['opmap'] @@ -51,6 +55,8 @@ def main(opcode_py, outfile='Include/opcode.h'): ('HAVE_ARGUMENT', opcode['HAVE_ARGUMENT'])) fobj.write(footer) + print("%s regenerated from %s" % (outfile, opcode_py)) + if __name__ == '__main__': main(sys.argv[1], sys.argv[2]) -- cgit v1.2.1