##// END OF EJS Templates
Moved twisted import into a function, so base exception classes in kernel...
Fernando Perez -
Show More
@@ -22,4 +22,4 b' __docformat__ = "restructuredtext en"'
22 # the file COPYING, distributed as part of this software.
22 # the file COPYING, distributed as part of this software.
23 #-----------------------------------------------------------------------------
23 #-----------------------------------------------------------------------------
24
24
25 from IPython.kernel.error import TaskRejectError No newline at end of file
25 from IPython.kernel.error import TaskRejectError
@@ -17,8 +17,6 b' __test__ = {}'
17 #-------------------------------------------------------------------------------
17 #-------------------------------------------------------------------------------
18 # Imports
18 # Imports
19 #-------------------------------------------------------------------------------
19 #-------------------------------------------------------------------------------
20 from twisted.python import failure
21
22 from IPython.kernel.core import error
20 from IPython.kernel.core import error
23
21
24 #-------------------------------------------------------------------------------
22 #-------------------------------------------------------------------------------
@@ -179,6 +177,8 b' class CompositeError(KernelError):'
179 raise et, ev, etb
177 raise et, ev, etb
180
178
181 def collect_exceptions(rlist, method):
179 def collect_exceptions(rlist, method):
180 from twisted.python import failure
181
182 elist = []
182 elist = []
183 for r in rlist:
183 for r in rlist:
184 if isinstance(r, failure.Failure):
184 if isinstance(r, failure.Failure):
General Comments 0
You need to be logged in to leave comments. Login now