[Lldb-commits] [lldb] r132221 - /lldb/trunk/scripts/Python/edit-swig-python-wrapper-file.py

Johnny Chen johnny.chen at apple.com
Fri May 27 14:58:22 PDT 2011


Author: johnny
Date: Fri May 27 16:58:22 2011
New Revision: 132221

URL: http://llvm.org/viewvc/llvm-project?rev=132221&view=rev
Log:
Use the with statement to simplify the build script.

Modified:
    lldb/trunk/scripts/Python/edit-swig-python-wrapper-file.py

Modified: lldb/trunk/scripts/Python/edit-swig-python-wrapper-file.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/scripts/Python/edit-swig-python-wrapper-file.py?rev=132221&r1=132220&r2=132221&view=diff
==============================================================================
--- lldb/trunk/scripts/Python/edit-swig-python-wrapper-file.py (original)
+++ lldb/trunk/scripts/Python/edit-swig-python-wrapper-file.py Fri May 27 16:58:22 2011
@@ -20,52 +20,30 @@
 # That's what this python script does.
 #
 
-
 import os
 
+include_python = '#include <Python.h>'
+include_python_ifdef = '''#if defined (__APPLE__)
+#include <Python/Python.h>
+#else
+#include <Python.h>
+#endif
+'''
+
 input_dir_name = os.environ["SRCROOT"]
 full_input_name = input_dir_name + "/source/LLDBWrapPython.cpp"
 full_output_name = full_input_name + ".edited"
 
-try:
-    f_in = open (full_input_name, 'r')
-except IOError:
-    print "Error:  Unable to open file for reading: " + full_input_name
-else:
-    try:
-        f_out = open (full_output_name, 'w')
-    except IOError:
-        print "Error:  Unable to open file for writing: " + full_output_name
-    else:
-        include_line_found = False
+with open(full_input_name, 'r') as f_in:
+    with open(full_output_name, 'w') as f_out:
+        include_python_found = False
+        for line in f_in:
+            if not include_python_found:
+                if line.startswith(include_python):
+                    # Write out the modified lines.
+                    f_out.write(include_python_ifdef)
+                    include_python_found = True
+                    continue
 
-        try:
-            line = f_in.readline()
-        except IOError:
-            print "Error occurred while reading file."
-        else:
-            while line:
-                #
-                #
-                if not include_line_found:
-                    if (line.find ("#include <Python.h>") == 0):
-                        f_out.write ("#if defined (__APPLE__)\n");
-                        f_out.write ("#include <Python/Python.h>\n");
-                        f_out.write ("#else\n");
-                        f_out.write (line);
-                        f_out.write ("#endif\n");
-                        include_line_found = True
-                    else:
-                        f_out.write (line)
-                else:
-                    f_out.write (line)
-                try:
-                    line = f_in.readline()
-                except IOError:
-                    print "Error occurred while reading file."
-                    
-            try:
-                f_in.close()
-                f_out.close()
-            except:
-                print "Error occurred while closing files"
+            # Otherwise, copy the line verbatim to the output file.
+            f_out.write(line)





More information about the lldb-commits mailing list