##// END OF EJS Templates
Fixing two small bugs in :mod:`IPython.kernel`....
Brian Granger -
Show More
@@ -24,15 +24,25 b' The main classes in this module are:'
24 24 #-----------------------------------------------------------------------------
25 25
26 26 #-----------------------------------------------------------------------------
27 # Imports
27 # Warnings control
28 28 #-----------------------------------------------------------------------------
29 29
30 import sys
31 30 import warnings
32 31
33 # from IPython.utils import growl
34 # growl.start("IPython1 Client")
32 # Twisted generates annoying warnings with Python 2.6, as will do other code
33 # that imports 'sets' as of today
34 warnings.filterwarnings('ignore', 'the sets module is deprecated',
35 DeprecationWarning )
36
37 # This one also comes from Twisted
38 warnings.filterwarnings('ignore', 'the sha module is deprecated',
39 DeprecationWarning)
40
41 #-----------------------------------------------------------------------------
42 # Imports
43 #-----------------------------------------------------------------------------
35 44
45 import sys
36 46
37 47 from twisted.internet import reactor
38 48 from twisted.internet.error import PotentialZombieWarning
@@ -73,8 +83,6 b' rit.setDaemon(True)'
73 83 rit.start()
74 84
75 85
76
77
78 86 __all__ = [
79 87 'MapTask',
80 88 'StringTask',
@@ -23,7 +23,7 b' from IPython.core.component import Component'
23 23 from IPython.external import Itpl
24 24 from IPython.utils.traitlets import Str, Int, List, Unicode
25 25 from IPython.utils.path import get_ipython_module_path
26 from IPython.utils.process import find_cmd, pycmd2argv
26 from IPython.utils.process import find_cmd, pycmd2argv, FindCmdError
27 27 from IPython.kernel.twistedutil import (
28 28 gatherBoth,
29 29 make_deferred,
@@ -538,7 +538,10 b' class SSHEngineSetLauncher(BaseLauncher):'
538 538 # This is only used on Windows.
539 539 def find_job_cmd():
540 540 if os.name=='nt':
541 return find_cmd('job')
541 try:
542 return find_cmd('job')
543 except FindCmdError:
544 return 'job'
542 545 else:
543 546 return 'job'
544 547
General Comments 0
You need to be logged in to leave comments. Login now