← Back to branch summary

~ellisonbg/ipython/trunk-dev

« back to all changes in this revision

Viewing changes to IPython/kernel/multienginefc.py

  • Committer: Brian Granger
  • Date: 2010-01-31 23:57:46 UTC
  • mfrom: (1109.1.113 ipython)
  • Revision ID: ellisonbg@gmail.com-20100131235746-rj81qa8klooepq2m
Merging from upstream trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
IPython/kernel/multienginefc.py
22
22
 
23
23
from zope.interface import Interface, implements
24
24
from twisted.internet import defer
25
 
from twisted.python import components, failure, log
 
25
from twisted.python import components, failure
26
26
 
27
27
from foolscap import Referenceable
28
28
 
29
29
from IPython.kernel import error 
30
 
from IPython.kernel.util import printer
31
30
from IPython.kernel import map as Map
32
31
from IPython.kernel.parallelfunction import ParallelFunction
33
32
from IPython.kernel.mapper import (
36
35
    IMapper
37
36
)
38
37
from IPython.kernel.twistedutil import gatherBoth
39
 
from IPython.kernel.multiengine import (MultiEngine,
 
38
from IPython.kernel.multiengine import (
40
39
    IMultiEngine,
41
40
    IFullSynchronousMultiEngine,
42
41
    ISynchronousMultiEngine)
43
 
from IPython.kernel.multiengineclient import wrapResultList
44
42
from IPython.kernel.pendingdeferred import PendingDeferredManager
45
 
from IPython.kernel.pickleutil import (can, canDict,
46
 
    canSequence, uncan, uncanDict, uncanSequence)
 
43
from IPython.kernel.pickleutil import (
 
44
    canDict,
 
45
    canSequence, uncanDict, uncanSequence
 
46
)
47
47
 
48
48
from IPython.kernel.clientinterfaces import (
49
49
    IFCClientInterfaceProvider,