Show More
@@ -84,11 +84,6 b' from IPython.utils.traitlets import (Integer, CBool, CaselessStrEnum, Enum,' | |||||
84 | from IPython.utils.warn import warn, error |
|
84 | from IPython.utils.warn import warn, error | |
85 | import IPython.core.hooks |
|
85 | import IPython.core.hooks | |
86 |
|
86 | |||
87 | try: |
|
|||
88 | from IPython.parallel.error import RemoteError |
|
|||
89 | except ImportError: |
|
|||
90 | class RemoteError(Exception): pass |
|
|||
91 |
|
||||
92 | #----------------------------------------------------------------------------- |
|
87 | #----------------------------------------------------------------------------- | |
93 | # Globals |
|
88 | # Globals | |
94 | #----------------------------------------------------------------------------- |
|
89 | #----------------------------------------------------------------------------- | |
@@ -1702,6 +1697,11 b' class InteractiveShell(SingletonConfigurable):' | |||||
1702 | care of calling it if needed, so unless you are explicitly catching a |
|
1697 | care of calling it if needed, so unless you are explicitly catching a | |
1703 | SyntaxError exception, don't try to analyze the stack manually and |
|
1698 | SyntaxError exception, don't try to analyze the stack manually and | |
1704 | simply call this method.""" |
|
1699 | simply call this method.""" | |
|
1700 | try: | |||
|
1701 | from IPython.parallel.error import RemoteError | |||
|
1702 | except ImportError: | |||
|
1703 | class RemoteError(Exception): pass | |||
|
1704 | ||||
1705 |
|
1705 | |||
1706 | try: |
|
1706 | try: | |
1707 | try: |
|
1707 | try: |
General Comments 0
You need to be logged in to leave comments.
Login now