Addressing various review comments.

IPython/frontend/cocoa/tests/test_cocoa_frontend.py

@@ -15,6 +15,7 b' __docformat__ = "restructuredtext en"'
 # Imports                                                                   
 #---------------------------------------------------------------------------
 
+
 try:
     from IPython.kernel.core.interpreter import Interpreter
     import IPython.kernel.engineservice as es
@@ -22,7 +23,7 b' try:'
     from twisted.internet.defer import succeed
     from IPython.frontend.cocoa.cocoa_frontend import IPythonCocoaController                                                    
     from Foundation import NSMakeRect
-    from AppKit import NSTextView, NSScrollView                                                
+    from AppKit import NSTextView, NSScrollView
 except ImportError:
     import nose
     raise nose.SkipTest("This test requires zope.interface, Twisted, Foolscap and PyObjC")

IPython/kernel/core/ultraTB.py

@@ -268,6 +268,8 b' def _formatTracebackLines(lnum, index, lines, Colors, lvals=None,scheme=None):'
     # This lets us get fully syntax-highlighted tracebacks.
     if scheme is None:
         try:
+            # Again, reference to a global __IPYTHON__ that doesn't exist.
+            # XXX
             scheme = __IPYTHON__.rc.colors
         except:
             scheme = DEFAULT_SCHEME
@@ -489,7 +491,7 b' class ListTB(TBTools):'
 
         # This is being commented out for now as the __IPYTHON__ variable
         # referenced here is not resolved and causes massive test failures
-        # and errors. B. Granger, 04/2009.
+        # and errors. B. Granger, 04/2009. XXX
         # See https://bugs.launchpad.net/bugs/362137
         # # vds:>>
         # if have_filedata:
@@ -810,7 +812,7 b' class VerboseTB(TBTools):'
 
         # This is being commented out for now as the __IPYTHON__ variable
         # referenced here is not resolved and causes massive test failures
-        # and errors. B. Granger, 04/2009.
+        # and errors. B. Granger, 04/2009. XXX
         # See https://bugs.launchpad.net/bugs/362137
         # # vds: >>
         # if records:

IPython/kernel/scripts/ipcluster.py

@@ -29,8 +29,12 b' from twisted.python import failure, log'
 
 from IPython.external import argparse
 from IPython.external import Itpl
-from IPython.genutils import get_ipython_dir, get_log_dir, get_security_dir
-from IPython.genutils import num_cpus
+from IPython.genutils import (
+    get_ipython_dir, 
+    get_log_dir, 
+    get_security_dir, 
+    num_cpus
+)
 from IPython.kernel.fcutil import have_crypto
 
 # Create various ipython directories if they don't exist.
@@ -485,6 +489,7 b' class SSHEngineSet(object):'
 
 
 def check_security(args, cont_args):
+    """Check to see if we should run with SSL support."""
     if (not args.x or not args.y) and not have_crypto:
         log.err("""
 OpenSSL/pyOpenSSL is not available, so we can't run in secure mode.
@@ -499,6 +504,7 b' Try running ipcluster with the -xy flags: ipcluster local -xy -n 4""")'
 
 
 def check_reuse(args, cont_args):
+    """Check to see if we should try to resuse FURL files."""
     if args.r:
         cont_args.append('-r')
         if args.client_port == 0 or args.engine_port == 0:
@@ -513,11 +519,13 b' the --client-port and --engine-port options.""")'
 
 
 def _err_and_stop(f):
+    """Errback to log a failure and halt the reactor on a fatal error."""
     log.err(f)
     reactor.stop()
 
 
 def _delay_start(cont_pid, start_engines, furl_file, reuse):
+    """Wait for controller to create FURL files and the start the engines."""
     if not reuse:
         if os.path.isfile(furl_file):
             os.unlink(furl_file)

IPython/kernel/scripts/ipcontroller.py

@@ -21,9 +21,10 b' __docformat__ = "restructuredtext en"'
 import sys
 sys.path.insert(0, '')
 
-import sys, time, os
-import tempfile
 from optparse import OptionParser
+import os
+import time
+import tempfile
 
 from twisted.application import internet, service
 from twisted.internet import reactor, error, defer

IPython/kernel/scripts/ipengine.py

@@ -21,8 +21,8 b' __docformat__ = "restructuredtext en"'
 import sys
 sys.path.insert(0, '')
 
-import sys, os
 from optparse import OptionParser
+import os
 
 from twisted.application import service
 from twisted.internet import reactor

docs/source/parallel/parallel_process.txt

@@ -309,7 +309,7 b' you want to unlock the door and enter your house. As with your house, you want'
 to be able to create the key (or FURL file) once, and then simply use it at
 any point in the future.
 
-This is possible. but before you do this, you **must** remove any old FURL
+This is possible, but before you do this, you **must** remove any old FURL
 files in the :file:`~/.ipython/security` directory.
 
 .. warning::