Fixing small things in response to review.

IPython/kernel/scripts/ipcluster.py

@@ -22,17 +22,19 b' pjoin = os.path.join'
 
 from twisted.internet import reactor, defer
 from twisted.internet.protocol import ProcessProtocol
-from twisted.python import failure, log
 from twisted.internet.error import ProcessDone, ProcessTerminated
 from twisted.internet.utils import getProcessOutput
+from twisted.python import failure, log
 
 from IPython.external import argparse
 from IPython.external import Itpl
-from IPython.kernel.twistedutil import gatherBoth
-from IPython.kernel.util import printer
 from IPython.genutils import get_ipython_dir, num_cpus
 from IPython.kernel.fcutil import have_crypto
 from IPython.kernel.error import SecurityError
+from IPython.kernel.fcutil import have_crypto
+from IPython.kernel.twistedutil import gatherBoth
+from IPython.kernel.util import printer
+
 
 #-----------------------------------------------------------------------------
 # General process handling code
@@ -346,8 +348,8 b' def main_local(args):'
     cont_args.append('--logfile=%s' % pjoin(args.logdir,'ipcontroller'))
 
     # Check security settings before proceeding
-    keep_going = check_security(args, cont_args)
-    if not keep_going: return
+    if not check_security(args, cont_args):
+        return
 
     cl = ControllerLauncher(extra_args=cont_args)
     dstart = cl.start()
@@ -379,8 +381,8 b' def main_mpirun(args):'
     cont_args.append('--logfile=%s' % pjoin(args.logdir,'ipcontroller'))
 
     # Check security settings before proceeding
-    keep_going = check_security(args, cont_args)
-    if not keep_going: return
+    if not check_security(args, cont_args):
+        return
 
     cl = ControllerLauncher(extra_args=cont_args)
     dstart = cl.start()
@@ -416,8 +418,8 b' def main_pbs(args):'
     cont_args.append('--logfile=%s' % pjoin(args.logdir,'ipcontroller'))
 
     # Check security settings before proceeding
-    keep_going = check_security(args, cont_args)
-    if not keep_going: return
+    if not check_security(args, cont_args):
+        return
 
     cl = ControllerLauncher(extra_args=cont_args)
     dstart = cl.start()