Index: scripts/Python/interface/SBTarget.i
===================================================================
--- scripts/Python/interface/SBTarget.i
+++ scripts/Python/interface/SBTarget.i
@@ -425,6 +425,7 @@
                   const char **envp,
                   const char *working_directory);

+    %rename(Launch2) Launch;
     lldb::SBProcess
     Launch (lldb::SBLaunchInfo &launch_info, lldb::SBError& error);

Index: test/api/multiple-debuggers/multi-process-driver.cpp
===================================================================
--- test/api/multiple-debuggers/multi-process-driver.cpp
+++ test/api/multiple-debuggers/multi-process-driver.cpp
@@ -119,7 +119,7 @@

             SBLaunchInfo launch_info (NULL);
             SBError error;
-            SBProcess process = target.Launch (launch_info, error);
+            SBProcess process = target.Launch2 (launch_info, error);
             if (process.IsValid())
             {
                 SBListener listener = debugger.GetListener();
Index: test/python_api/event/TestEvents.py
===================================================================
--- test/python_api/event/TestEvents.py
+++ test/python_api/event/TestEvents.py
@@ -161,7 +161,7 @@
         # Now launch the process, and do not stop at entry point.
         error = lldb.SBError()
         process = target.Launch (listener,
-                                 None,      # argv
+                                 ['a','b'], # argv
                                  None,      # envp
                                  None,      # stdin_path
                                  None,      # stdout_path
@@ -229,7 +229,7 @@
         # Now launch the process, and do not stop at the entry point.
         error = lldb.SBError()
         process = target.Launch (listener,
-                                 None,      # argv
+                                 ['a','b'], # argv
                                  None,      # envp
                                  None,      # stdin_path
                                  None,      # stdout_path
Index: test/python_api/process/io/TestProcessIO.py
===================================================================
--- test/python_api/process/io/TestProcessIO.py
+++ test/python_api/process/io/TestProcessIO.py
@@ -209,7 +209,7 @@
         error = lldb.SBError()
         # This should launch the process and it should exit by the time we get back
         # because we have synchronous mode enabled
-        self.process = self.target.Launch (self.launch_info, error)
+        self.process = self.target.Launch2 (self.launch_info, error)

         self.assertTrue(error.Success(), "Make sure process launched successfully")
         self.assertTrue(self.process, PROCESS_IS_VALID)
Index: test/python_api/target/TestTargetAPI.py
===================================================================
--- test/python_api/target/TestTargetAPI.py
+++ test/python_api/target/TestTargetAPI.py
@@ -214,7 +214,7 @@
         # Now launch the process, do not stop at entry point, and redirect stdout to "stdout.txt" file.
         # The inferior should run to completion after "process.Continue()" call.
         error = lldb.SBError()
-        process = target.Launch (self.dbg.GetListener(), None, None, None, "stdout.txt", None, None, 0, False, error)
+        process = target.Launch2 (self.dbg.GetListener(), None, None, None, "stdout.txt", None, None, 0, False, error)
         process.Continue()
         #self.runCmd("process status")