Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2018-11-02 05:31:07 +00:00
parent 0f622206e4 a724525c00
commit 687fa6a8ca
70 changed files with 2344 additions and 2076 deletions
@@ -1178,6 +1178,7 @@ if __name__ == "__main__":
    if len(sys.argv) > 1:
        dstdir = sys.argv[1]
    if len(sys.argv) > 2:
-        srcfiles = [f.strip() for f in open(sys.argv[2], 'r').readlines()]
+        with open(sys.argv[2], 'r') as f:
+            srcfiles = [l.strip() for l in f.readlines()]
    generator = PythonWrapperGenerator()
    generator.gen(srcfiles, dstdir)