Show More
@@ -28,7 +28,10 b' from zope.interface import Interface, implements' | |||||
28 | from twisted.internet.base import DelayedCall |
|
28 | from twisted.internet.base import DelayedCall | |
29 | DelayedCall.debug = True |
|
29 | DelayedCall.debug = True | |
30 |
|
30 | |||
31 | from foolscap import Referenceable, DeadReferenceError |
|
31 | try: | |
|
32 | from foolscap.api import Referenceable, DeadReferenceError | |||
|
33 | except ImportError: | |||
|
34 | from foolscap import Referenceable, DeadReferenceError | |||
32 | from foolscap.referenceable import RemoteReference |
|
35 | from foolscap.referenceable import RemoteReference | |
33 |
|
36 | |||
34 | from IPython.kernel.pbutil import packageFailure, unpackageFailure |
|
37 | from IPython.kernel.pbutil import packageFailure, unpackageFailure |
@@ -24,7 +24,10 b' from twisted.internet import reactor, defer' | |||||
24 | from twisted.python import log |
|
24 | from twisted.python import log | |
25 |
|
25 | |||
26 | import foolscap |
|
26 | import foolscap | |
27 | from foolscap import Tub, UnauthenticatedTub |
|
27 | try: | |
|
28 | from foolscap.api import Tub, UnauthenticatedTub | |||
|
29 | except ImportError: | |||
|
30 | from foolscap import Tub, UnauthenticatedTub | |||
28 |
|
31 | |||
29 | from IPython.config.loader import Config |
|
32 | from IPython.config.loader import Config | |
30 | from IPython.kernel.configobjfactory import AdaptedConfiguredObjectFactory |
|
33 | from IPython.kernel.configobjfactory import AdaptedConfiguredObjectFactory |
@@ -22,7 +22,11 b' import warnings' | |||||
22 | from twisted.python import components |
|
22 | from twisted.python import components | |
23 | from twisted.python.failure import Failure |
|
23 | from twisted.python.failure import Failure | |
24 | from zope.interface import Interface, implements, Attribute |
|
24 | from zope.interface import Interface, implements, Attribute | |
25 | from foolscap import DeadReferenceError |
|
25 | ||
|
26 | try: | |||
|
27 | from foolscap.api import DeadReferenceError | |||
|
28 | except ImportError: | |||
|
29 | from foolscap import DeadReferenceError | |||
26 |
|
30 | |||
27 | from IPython.utils.coloransi import TermColors |
|
31 | from IPython.utils.coloransi import TermColors | |
28 |
|
32 |
@@ -24,7 +24,10 b' from zope.interface import Interface, implements' | |||||
24 | from twisted.internet import defer |
|
24 | from twisted.internet import defer | |
25 | from twisted.python import components, failure |
|
25 | from twisted.python import components, failure | |
26 |
|
26 | |||
27 | from foolscap import Referenceable |
|
27 | try: | |
|
28 | from foolscap.api import Referenceable | |||
|
29 | except ImportError: | |||
|
30 | from foolscap import Referenceable | |||
28 |
|
31 | |||
29 | from IPython.kernel import error |
|
32 | from IPython.kernel import error | |
30 | from IPython.kernel import map as Map |
|
33 | from IPython.kernel import map as Map |
@@ -20,7 +20,11 b' __docformat__ = "restructuredtext en"' | |||||
20 |
|
20 | |||
21 | from zope.interface import Interface, implements |
|
21 | from zope.interface import Interface, implements | |
22 | from twisted.python import components |
|
22 | from twisted.python import components | |
23 | from foolscap import DeadReferenceError |
|
23 | ||
|
24 | try: | |||
|
25 | from foolscap.api import DeadReferenceError | |||
|
26 | except ImportError: | |||
|
27 | from foolscap import DeadReferenceError | |||
24 |
|
28 | |||
25 | from IPython.kernel.twistedutil import blockingCallFromThread |
|
29 | from IPython.kernel.twistedutil import blockingCallFromThread | |
26 | from IPython.kernel import task, error |
|
30 | from IPython.kernel import task, error |
@@ -24,7 +24,10 b' from zope.interface import Interface, implements' | |||||
24 | from twisted.internet import defer |
|
24 | from twisted.internet import defer | |
25 | from twisted.python import components |
|
25 | from twisted.python import components | |
26 |
|
26 | |||
27 | from foolscap import Referenceable |
|
27 | try: | |
|
28 | from foolscap.api import Referenceable | |||
|
29 | except ImportError: | |||
|
30 | from foolscap import Referenceable | |||
28 |
|
31 | |||
29 | from IPython.kernel import task as taskmodule |
|
32 | from IPython.kernel import task as taskmodule | |
30 | from IPython.kernel.clientinterfaces import ( |
|
33 | from IPython.kernel.clientinterfaces import ( |
General Comments 0
You need to be logged in to leave comments.
Login now