Fixes so the test suite runs when Twisted is not available.

Other minor cleanups (formatting and unused imports)

IPython/frontend/asyncfrontendbase.py

@@ -3,6 +3,9 b' Base front end class for all async frontends.'
 """
 __docformat__ = "restructuredtext en"
 
+# Tell nose to skip this module
+__test__ = {}
+
 #-------------------------------------------------------------------------------
 #  Copyright (C) 2008  The IPython Development Team
 #
@@ -10,20 +13,25 b' __docformat__ = "restructuredtext en"'
 #  the file COPYING, distributed as part of this software.
 #-------------------------------------------------------------------------------
 
-
 #-------------------------------------------------------------------------------
 # Imports
 #-------------------------------------------------------------------------------
 
+# Third-party
+from twisted.python.failure import Failure
+from zope.interface import implements, classProvides
+
+# From IPython
 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
 
+#-----------------------------------------------------------------------------
+# Classes and functions
+#-----------------------------------------------------------------------------
 
 class AsyncFrontEndBase(FrontEndBase):
     """
@@ -41,8 +49,7 b' class AsyncFrontEndBase(FrontEndBase):'
                 self.history = FrontEndHistory(input_cache=[''])
         else:
             self.history = history
-    
-    
+        
     def execute(self, block, blockID=None):
         """Execute the block and return the deferred result.
         
@@ -73,5 +80,3 b' class AsyncFrontEndBase(FrontEndBase):'
             errback=self.render_error)
         
         return d
-    
-

IPython/frontend/tests/test_asyncfrontendbase.py

@@ -3,6 +3,9 b''
 """This file contains unittests for the asyncfrontendbase module."""
 
 __docformat__ = "restructuredtext en"
+                                                                            
+# Tell nose to skip this module
+__test__ = {}
 
 #---------------------------------------------------------------------------
 #  Copyright (C) 2008  The IPython Development Team                         
@@ -10,20 +13,21 b' __docformat__ = "restructuredtext en"'
 #  Distributed under the terms of the BSD License.  The full license is in  
 #  the file COPYING, distributed as part of this software.                  
 #---------------------------------------------------------------------------
-                                                                            
+
 #---------------------------------------------------------------------------
 # Imports                                                                   
 #---------------------------------------------------------------------------
 
-# Tell nose to skip this module
-__test__ = {}
-
 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
 
+#-----------------------------------------------------------------------------
+# Classes and functions
+#-----------------------------------------------------------------------------
 
 class FrontEndCallbackChecker(AsyncFrontEndBase):
     """FrontEndBase subclass for checking callbacks"""
@@ -106,4 +110,3 b' class TestAsyncFrontendBase(unittest.TestCase):'
     def test_history_returns_none_at_startup(self):        
         self.assert_(self.fb.get_history_previous("")==None)
         self.assert_(self.fb.get_history_next()==None)
-

IPython/kernel/engineservice.py

@@ -23,6 +23,9 b' method that automatically added methods to engines.'
 
 __docformat__ = "restructuredtext en"
 
+# Tell nose to skip this module
+__test__ = {}
+
 #-------------------------------------------------------------------------------
 #  Copyright (C) 2008  The IPython Development Team
 #
@@ -34,12 +37,9 b' __docformat__ = "restructuredtext en"'
 # Imports
 #-------------------------------------------------------------------------------
 
-# Tell nose to skip the testing of this module
-__test__ = {}
-
-import os, sys, copy
+import copy
+import sys
 import cPickle as pickle
-from new import instancemethod
 
 from twisted.application import service
 from twisted.internet import defer, reactor
@@ -47,11 +47,7 b' from twisted.python import log, failure, components'
 import zope.interface as zi
 
 from IPython.kernel.core.interpreter import Interpreter
-from IPython.kernel import newserialized, error, util
-from IPython.kernel.util import printer
-from IPython.kernel.twistedutil import gatherBoth, DeferredList
-from IPython.kernel import codeutil
-
+from IPython.kernel import newserialized, error
 
 #-------------------------------------------------------------------------------
 # Interface specification for the Engine

IPython/kernel/error.py

@@ -4,6 +4,9 b''
 
 __docformat__ = "restructuredtext en"
 
+# Tell nose to skip this module
+__test__ = {}
+
 #-------------------------------------------------------------------------------
 #  Copyright (C) 2008  The IPython Development Team
 #
@@ -14,9 +17,9 b' __docformat__ = "restructuredtext en"'
 #-------------------------------------------------------------------------------
 # Imports
 #-------------------------------------------------------------------------------
+from twisted.python import failure
 
 from IPython.kernel.core import error
-from twisted.python import failure
 
 #-------------------------------------------------------------------------------
 # Error classes

IPython/kernel/newserialized.py

@@ -5,6 +5,9 b''
 
 __docformat__ = "restructuredtext en"
 
+# Tell nose to skip this module
+__test__ = {}
+
 #-------------------------------------------------------------------------------
 #  Copyright (C) 2008  The IPython Development Team
 #
@@ -18,8 +21,8 b' __docformat__ = "restructuredtext en"'
 
 import cPickle as pickle
 
-from zope.interface import Interface, implements
 from twisted.python import components
+from zope.interface import Interface, implements
 
 try:
     import numpy
@@ -28,6 +31,10 b' except ImportError:'
 
 from IPython.kernel.error import SerializationError
 
+#-----------------------------------------------------------------------------
+# Classes and functions
+#-----------------------------------------------------------------------------
+
 class ISerialized(Interface):
     
     def getData():

IPython/testing/iptest.py

@@ -107,6 +107,23 b" if not os.name == 'posix':"
 if not have_pexpect:
     EXCLUDE.append(pjoin('IPython', 'irunner'))
 
+if not have_twisted:
+    EXCLUDE.append(pjoin('IPython', 'frontend', 'asyncfrontendbase'))
+    EXCLUDE.append(pjoin('IPython', 'frontend', 'prefilterfrontend'))
+    EXCLUDE.append(pjoin('IPython', 'frontend', 'frontendbase'))
+    EXCLUDE.append(pjoin('IPython', 'frontend', 'linefrontendbase'))
+    EXCLUDE.append(pjoin('IPython', 'frontend', 'tests', 'test_linefrontend'))
+    EXCLUDE.append(pjoin('IPython', 'frontend', 'tests', 'test_frontendbase'))
+    EXCLUDE.append(pjoin('IPython', 'frontend', 'tests',
+                         'test_prefilterfrontend'))
+    EXCLUDE.append(pjoin('IPython', 'frontend', 'tests',
+                         'test_asyncfrontendbase'))
+    EXCLUDE.append(pjoin('IPython', 'kernel', 'error'))
+    EXCLUDE.append(pjoin('IPython', 'testing', 'parametric'))
+    EXCLUDE.append(pjoin('IPython', 'testing', 'util'))
+    EXCLUDE.append(pjoin('IPython', 'testing', 'tests', 'test_decorators_trial'))
+
+
 # This is needed for the reg-exp to match on win32 in the ipdoctest plugin.
 if sys.platform == 'win32':
     EXCLUDE = [s.replace('\\','\\\\') for s in EXCLUDE]
@@ -232,12 +249,15 b' def make_runners():'
        'Logger.py', 'macro.py', 'Magic.py', 'OInspect.py',
        'OutputTrap.py', 'platutils.py', 'prefilter.py', 'Prompts.py',
        'PyColorize.py', 'Release.py', 'rlineimpl.py', 'shadowns.py',
-       'shellglobals.py', 'strdispatch.py', 'twshell.py',
+       'shellglobals.py', 'strdispatch.py', 
        'ultraTB.py', 'upgrade_dir.py', 'usage.py', 'wildcard.py',
        # See note above for why this is skipped
        # 'Shell.py',
        'winconsole.py']
 
+    if have_twisted:
+        top_mod.append('twshell.py')
+
     if have_pexpect:
         top_mod.append('irunner.py')
 

IPython/tests/test_magic.py

@@ -43,7 +43,6 b' def doctest_hist_f():'
     In [10]: tfile = tempfile.mktemp('.py','tmp-ipython-')
 
     In [11]: %hist -n -f $tfile 3
-
     """
 
 

IPython/twshell.py

@@ -2,6 +2,9 b''
 
 XXX - This module is missing proper docs.
 """
+# Tell nose to skip this module
+__test__ = {}
+
 import sys
 
 from twisted.internet import reactor, threads