Merge pull request #7202 from minrk/parallel-engine-main

use `-c` to launch ipengine/ipcontroller on Windows Python 2

IPython/parallel/apps/launcher.py

@@ -68,10 +68,12 b' ipengine_cmd_argv = [sys.executable, "-m", "IPython.parallel.engine"]'
 ipcontroller_cmd_argv = [sys.executable, "-m", "IPython.parallel.controller"]
 
 if WINDOWS and sys.version_info < (3,):
-    # `python -m package` doesn't work on Windows Python 2,
-    # but `python -m module` does.
-    ipengine_cmd_argv = [sys.executable, "-m", "IPython.parallel.apps.ipengineapp"]
-    ipcontroller_cmd_argv = [sys.executable, "-m", "IPython.parallel.apps.ipcontrollerapp"]
+    # `python -m package` doesn't work on Windows Python 2
+    # due to weird multiprocessing bugs
+    # and python -m module puts classes in the `__main__` module,
+    # so instance checks get confused
+    ipengine_cmd_argv = [sys.executable, "-c", "from IPython.parallel.engine.__main__ import main; main()"]
+    ipcontroller_cmd_argv = [sys.executable, "-c", "from IPython.parallel.controller.__main__ import main; main()"]
 
 #-----------------------------------------------------------------------------
 # Base launchers and errors

IPython/parallel/controller/__main__.py

@@ -1,3 +1,6 b''
-if __name__ == '__main__':
+def main():
     from IPython.parallel.apps import ipcontrollerapp as app
     app.launch_new_instance()
+    
+if __name__ == '__main__':
+    main()

IPython/parallel/engine/__main__.py

@@ -1,3 +1,6 b''
-if __name__ == '__main__':
+def main():
     from IPython.parallel.apps import ipengineapp as app
     app.launch_new_instance()
+    
+if __name__ == '__main__':
+    main()