From f33ae765a961629f2b348652f7404c8cb37351e7 2011-06-20 23:40:17
From: MinRK <benjaminrk@gmail.com>
Date: 2011-06-20 23:40:17
Subject: [PATCH] don't pass profile_dir as kwarg in ipclusterapp

also fix PBS->SGE typo from copy/paste

---

diff --git a/IPython/parallel/apps/ipclusterapp.py b/IPython/parallel/apps/ipclusterapp.py
index 161696d..f47512a 100755
--- a/IPython/parallel/apps/ipclusterapp.py
+++ b/IPython/parallel/apps/ipclusterapp.py
@@ -316,7 +316,7 @@ class IPClusterEngines(BaseParallelApplication):
         self.log.info("Starting %i engines"%self.n)
         self.engine_launcher.start(
             self.n,
-            profile_dir=self.profile_dir.location
+            self.profile_dir.location
         )
 
     def stop_engines(self):
@@ -422,7 +422,7 @@ class IPClusterStart(IPClusterEngines):
     
     def start_controller(self):
         self.controller_launcher.start(
-            profile_dir=self.profile_dir.location
+            self.profile_dir.location
         )
         
     def stop_controller(self):
diff --git a/IPython/parallel/apps/launcher.py b/IPython/parallel/apps/launcher.py
index cc7a8d7..8065af9 100644
--- a/IPython/parallel/apps/launcher.py
+++ b/IPython/parallel/apps/launcher.py
@@ -989,7 +989,7 @@ class SGEControllerLauncher(SGELauncher):
     def start(self, profile_dir):
         """Start the controller by profile or profile_dir."""
         self.log.info("Starting PBSControllerLauncher: %r" % self.args)
-        return super(PBSControllerLauncher, self).start(1, profile_dir)
+        return super(SGEControllerLauncher, self).start(1, profile_dir)
 
 class SGEEngineSetLauncher(SGELauncher):
     """Launch Engines with SGE"""