##// END OF EJS Templates
Merge pull request #2031 from minrk/confirm...
Fernando Perez -
r7692:30839505 merge
parent child Browse files
Show More
@@ -470,7 +470,7 class NotebookApp(BaseIPythonApplication):
470 470 if 'dev' in zmq.__version__:
471 471 zmq_v.append(999)
472 472 zmq_v = tuple(zmq_v)
473 if zmq_v >= (2,1,9):
473 if zmq_v >= (2,1,9) and not sys.platform.startswith('win'):
474 474 # This won't work with 2.1.7 and
475 475 # 2.1.9-10 will log ugly 'Interrupted system call' messages,
476 476 # but it will work
@@ -496,6 +496,8 class NotebookApp(BaseIPythonApplication):
496 496
497 497 A second ^C, or answering 'y' within 5s will cause shutdown,
498 498 otherwise original SIGINT handler will be restored.
499
500 This doesn't work on Windows.
499 501 """
500 502 # FIXME: remove this delay when pyzmq dependency is >= 2.1.11
501 503 time.sleep(0.1)
General Comments 0
You need to be logged in to leave comments. Login now