Merging with upstream

IPython/frontend/asyncfrontendbase.py

@@ -14,12 +14,13 b' __docformat__ = "restructuredtext en"'
 #-------------------------------------------------------------------------------
 # Imports
 #-------------------------------------------------------------------------------
-from IPython.external import guid
 
+from IPython.external import guid
 
 from zope.interface import Interface, Attribute, implements, classProvides
 from twisted.python.failure import Failure
-from IPython.frontend.frontendbase import FrontEndBase, IFrontEnd, IFrontEndFactory
+from IPython.frontend.frontendbase import (
+    FrontEndBase, IFrontEnd, IFrontEndFactory)
 from IPython.kernel.core.history import FrontEndHistory
 from IPython.kernel.engineservice import IEngineCore
 

IPython/frontend/cocoa/tests/test_cocoa_frontend.py

@@ -15,19 +15,27 b' __docformat__ = "restructuredtext en"'
 # Imports                                                                   
 #---------------------------------------------------------------------------
 
-try:
+# Tell nose to skip this module
+__test__ = {}
+
+from twisted.trial import unittest
+from twisted.internet.defer import succeed
+
     from IPython.kernel.core.interpreter import Interpreter
     import IPython.kernel.engineservice as es
-    from IPython.testing.util import DeferredTestCase
-    from twisted.internet.defer import succeed
+
+try:
     from IPython.frontend.cocoa.cocoa_frontend import IPythonCocoaController                                                    
     from Foundation import NSMakeRect
     from AppKit import NSTextView, NSScrollView                                                
 except ImportError:
-    import nose
-    raise nose.SkipTest("This test requires zope.interface, Twisted, Foolscap and PyObjC")
+    # This tells twisted.trial to skip this module if PyObjC is not found
+    skip = True
 
-class TestIPythonCocoaControler(DeferredTestCase):
+#---------------------------------------------------------------------------
+# Tests
+#---------------------------------------------------------------------------
+class TestIPythonCocoaControler(unittest.TestCase):
     """Tests for IPythonCocoaController"""
    
     def setUp(self):
@@ -47,19 +55,17 b' class TestIPythonCocoaControler(DeferredTestCase):'
             del result['number']
             del result['id']
             return result
-        self.assertDeferredEquals(
-            self.controller.execute(code).addCallback(removeNumberAndID), 
-            expected)
+        d = self.controller.execute(code)
+        d.addCallback(removeNumberAndID)
+        d.addCallback(lambda r: self.assertEquals(r, expected))
    
     def testControllerMirrorsUserNSWithValuesAsStrings(self):
         code = """userns1=1;userns2=2"""
         def testControllerUserNS(result):
             self.assertEquals(self.controller.userNS['userns1'], 1)
             self.assertEquals(self.controller.userNS['userns2'], 2)
-       
         self.controller.execute(code).addCallback(testControllerUserNS)
    
-   
     def testControllerInstantiatesIEngine(self):
         self.assert_(es.IEngineBase.providedBy(self.controller.engine))
    

IPython/frontend/tests/test_asyncfrontendbase.py

@@ -15,16 +15,14 b' __docformat__ = "restructuredtext en"'
 # Imports                                                                   
 #---------------------------------------------------------------------------
 
+# Tell nose to skip this module
+__test__ = {}
 
-try:
     from twisted.trial import unittest
     from IPython.frontend.asyncfrontendbase import AsyncFrontEndBase
     from IPython.frontend import frontendbase 
     from IPython.kernel.engineservice import EngineService
     from IPython.testing.parametric import Parametric, parametric
-except ImportError:
-    import nose
-    raise nose.SkipTest("This test requires zope.interface, Twisted and Foolscap")
 
 
 class FrontEndCallbackChecker(AsyncFrontEndBase):

IPython/frontend/tests/test_process.py

@@ -5,12 +5,12 b' Test process execution and IO redirection.'
 
 __docformat__ = "restructuredtext en"
 
-#-------------------------------------------------------------------------------
-#  Copyright (C) 2008  The IPython Development Team
+#-----------------------------------------------------------------------------
+#  Copyright (C) 2008-2009  The IPython Development Team
 #
 #  Distributed under the terms of the BSD License.  The full license is
 #  in the file COPYING, distributed as part of this software.
-#-------------------------------------------------------------------------------
+#-----------------------------------------------------------------------------
 
 from cStringIO import StringIO
 from time import sleep

IPython/kernel/core/tests/test_interpreter.py

@@ -22,6 +22,9 b' from IPython.kernel.core.interpreter import Interpreter'
 # Tests 
 #-----------------------------------------------------------------------------
 
+# Tell nose to skip this module
+__test__ = {}
+
 class TestInterpreter(unittest.TestCase):
 
     def test_unicode(self):

IPython/kernel/core/tests/test_notification.py

@@ -15,6 +15,9 b' __docformat__ = "restructuredtext en"'
 # Imports                                                                     
 #-----------------------------------------------------------------------------
 
+# Tell nose to skip this module
+__test__ = {}
+
 import unittest
 import IPython.kernel.core.notification as notification
 from nose.tools import timed

IPython/kernel/core/tests/test_redirectors.py

@@ -12,12 +12,12 b' __docformat__ = "restructuredtext en"'
 #  in the file COPYING, distributed as part of this software.
 #-------------------------------------------------------------------------------
 
+# Tell nose to skip this module
+__test__ = {}
 
-# Stdlib imports
 import os
 from cStringIO import StringIO
 
-# Our own imports
 from IPython.testing import decorators as dec
 
 #-----------------------------------------------------------------------------

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)
@@ -728,8 +736,11 b' def get_args():'
     
     parser = argparse.ArgumentParser(
         description='IPython cluster startup.  This starts a controller and\
-        engines using various approaches.  THIS IS A TECHNOLOGY PREVIEW AND\
-        THE API WILL CHANGE SIGNIFICANTLY BEFORE THE FINAL RELEASE.'
+        engines using various approaches.  Use the IPYTHONDIR environment\
+        variable to change your IPython directory from the default of\
+        .ipython or _ipython.  The log and security subdirectories of your\
+        IPython directory will be used by this script for log files and\
+        security files.'
     )
     subparsers = parser.add_subparsers(
         help='available cluster types.  For help, do "ipcluster TYPE --help"')

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
@@ -263,7 +264,14 b' def init_config():'
     Initialize the configuration using default and command line options.
     """
     
-    parser = OptionParser()
+    parser = OptionParser("""ipcontroller [options]
+
+Start an IPython controller.
+
+Use the IPYTHONDIR environment variable to change your IPython directory 
+from the default of .ipython or _ipython.  The log and security 
+subdirectories of your IPython directory will be used by this script 
+for log files and security files.""")
     
     # Client related options
     parser.add_option(

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
@@ -140,7 +140,14 b' def init_config():'
     Initialize the configuration using default and command line options.
     """
     
-    parser = OptionParser()
+    parser = OptionParser("""ipengine [options]
+
+Start an IPython engine.
+
+Use the IPYTHONDIR environment variable to change your IPython directory 
+from the default of .ipython or _ipython.  The log and security 
+subdirectories of your IPython directory will be used by this script 
+for log files and security files.""")
     
     parser.add_option(
         "--furl-file",

IPython/kernel/tests/test_contexts.py

@@ -1,3 +1,6 b''
+# Tell nose to skip this module
+__test__ = {}
+
 #from __future__ import with_statement
 
 # XXX This file is currently disabled to preserve 2.4 compatibility.

IPython/kernel/tests/test_controllerservice.py

@@ -23,15 +23,15 b' __docformat__ = "restructuredtext en"'
 # Imports
 #-------------------------------------------------------------------------------
 
-try:
+# Tell nose to skip this module
+__test__ = {}
+
     from twisted.application.service import IService
     from IPython.kernel.controllerservice import ControllerService
     from IPython.kernel.tests import multienginetest as met
     from controllertest import IControllerCoreTestCase
     from IPython.testing.util import DeferredTestCase
-except ImportError:
-    import nose
-    raise nose.SkipTest("This test requires zope.interface, Twisted and Foolscap")
+
 
 class BasicControllerServiceTest(DeferredTestCase,
     IControllerCoreTestCase):

IPython/kernel/tests/test_enginefc.py

@@ -15,7 +15,9 b' __docformat__ = "restructuredtext en"'
 # Imports
 #-------------------------------------------------------------------------------
 
-try:
+# Tell nose to skip this module
+__test__ = {}
+
     from twisted.python import components
     from twisted.internet import reactor, defer
     from twisted.spread import pb
@@ -36,9 +38,6 b' try:'
         IEngineCoreTestCase, \
         IEngineSerializedTestCase, \
         IEngineQueuedTestCase
-except ImportError:
-    import nose
-    raise nose.SkipTest("This test requires zope.interface, Twisted and Foolscap")
 
 
 class EngineFCTest(DeferredTestCase, 

IPython/kernel/tests/test_engineservice.py

@@ -23,7 +23,9 b' __docformat__ = "restructuredtext en"'
 # Imports
 #-------------------------------------------------------------------------------
 
-try:
+# Tell nose to skip this module
+__test__ = {}
+
     from twisted.internet import defer
     from twisted.application.service import IService
     
@@ -34,9 +36,6 b' try:'
         IEngineSerializedTestCase, \
         IEngineQueuedTestCase, \
         IEnginePropertiesTestCase
-except ImportError:
-    import nose
-    raise nose.SkipTest("This test requires zope.interface, Twisted and Foolscap")    
 
 
 class BasicEngineServiceTest(DeferredTestCase,

IPython/kernel/tests/test_multiengine.py

@@ -15,16 +15,15 b' __docformat__ = "restructuredtext en"'
 # Imports
 #-----------------------------------------------------------------------------
 
-try:
+# Tell nose to skip this module
+__test__ = {}
+
     from twisted.internet import defer
     from IPython.testing.util import DeferredTestCase
     from IPython.kernel.controllerservice import ControllerService
     from IPython.kernel import multiengine as me
     from IPython.kernel.tests.multienginetest import (IMultiEngineTestCase,
         ISynchronousMultiEngineTestCase)
-except ImportError:
-    import nose
-    raise nose.SkipTest("This test requires zope.interface, Twisted and Foolscap")
 
  
 class BasicMultiEngineTestCase(DeferredTestCase, IMultiEngineTestCase):

IPython/kernel/tests/test_multienginefc.py

@@ -14,7 +14,9 b' __docformat__ = "restructuredtext en"'
 # Imports
 #-------------------------------------------------------------------------------
 
-try:
+# Tell nose to skip this module
+__test__ = {}
+
     from twisted.internet import defer, reactor
 
     from IPython.kernel.fcutil import Tub, UnauthenticatedTub
@@ -29,9 +31,7 b' try:'
     from IPython.kernel.parallelfunction import ParallelFunction
     from IPython.kernel.error import CompositeError
     from IPython.kernel.util import printer
-except ImportError:
-    import nose
-    raise nose.SkipTest("This test requires zope.interface, Twisted and Foolscap")
+
     
 def _raise_it(f):
     try:

IPython/kernel/tests/test_newserialized.py

@@ -15,7 +15,9 b' __docformat__ = "restructuredtext en"'
 # Imports
 #-----------------------------------------------------------------------------
 
-try:
+# Tell nose to skip this module
+__test__ = {}
+
     import zope.interface as zi
     from twisted.trial import unittest
     from IPython.testing.util import DeferredTestCase
@@ -27,9 +29,7 b' try:'
         UnSerialized, \
         SerializeIt, \
         UnSerializeIt
-except ImportError:
-    import nose
-    raise nose.SkipTest("This test requires zope.interface, Twisted and Foolscap")
+
 
 #-----------------------------------------------------------------------------
 # Tests

IPython/kernel/tests/test_pendingdeferred.py

@@ -16,7 +16,9 b' __docformat__ = "restructuredtext en"'
 # Imports
 #-------------------------------------------------------------------------------
 
-try:
+# Tell nose to skip this module
+__test__ = {}
+
     from twisted.internet import defer
     from twisted.python import failure
 
@@ -24,9 +26,7 b' try:'
     import IPython.kernel.pendingdeferred as pd
     from IPython.kernel import error
     from IPython.kernel.util import printer
-except ImportError:
-    import nose
-    raise nose.SkipTest("This test requires zope.interface, Twisted and Foolscap")
+
     
 class Foo(object):
 

IPython/kernel/tests/test_task.py

@@ -15,7 +15,9 b' __docformat__ = "restructuredtext en"'
 # Imports
 #-------------------------------------------------------------------------------
 
-try:
+# Tell nose to skip this module
+__test__ = {}
+
     import time
 
     from twisted.internet import defer
@@ -25,9 +27,7 b' try:'
     from IPython.kernel.multiengine import IMultiEngine
     from IPython.testing.util import DeferredTestCase
     from IPython.kernel.tests.tasktest import ITaskControllerTestCase
-except ImportError:
-    import nose
-    raise nose.SkipTest("This test requires zope.interface, Twisted and Foolscap")
+
 
 #-------------------------------------------------------------------------------
 # Tests

IPython/kernel/tests/test_taskfc.py

@@ -14,7 +14,9 b' __docformat__ = "restructuredtext en"'
 # Imports
 #-------------------------------------------------------------------------------
 
-try:
+# Tell nose to skip this module
+__test__ = {}
+
     import time
 
     from twisted.internet import defer, reactor
@@ -32,9 +34,6 b' try:'
     from IPython.kernel.clientconnector import ClientConnector
     from IPython.kernel.error import CompositeError
     from IPython.kernel.parallelfunction import ParallelFunction
-except ImportError:
-    import nose
-    raise nose.SkipTest("This test requires zope.interface, Twisted and Foolscap")
 
 
 #-------------------------------------------------------------------------------

IPython/kernel/tests/test_twistedutil.py

@@ -12,6 +12,9 b''
 # Imports
 #-----------------------------------------------------------------------------
 
+# Tell nose to skip this module
+__test__ = {}
+
 import tempfile
 import os, sys
 

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::