##// END OF EJS Templates
Merge pull request #1372 from minrk/reuse-cleanup...
Merge pull request #1372 from minrk/reuse-cleanup ipcontroller cleans up connection files unless reuse=True Connection files are not valid across sessions if reuse is False, but were previously preserved, which could cause engines to try to connect to the wrong ports if the Controller took too long to start and/or write new connection files. Also shuffles signal handling around a bit, so that a clean exit occurs, rather than calling sys.exit directly in the signal handler.

File last commit:

r5390:c82649ea
r6080:c1c517a0 merge
Show More
quitter.py
47 lines | 1.4 KiB | text/x-python | PythonLexer
Fernando Perez
Fix quitting: now, typing bare 'exit' or 'quit' unconditionally quits....
r2370 # coding: utf-8
Brian Granger
Created context manager for the things injected into __builtin__.
r2227 """
A simple class for quitting IPython.
Fernando Perez
Fix quitting: now, typing bare 'exit' or 'quit' unconditionally quits....
r2370 Authors
-------
* Fernando Perez
Brian Granger
Created context manager for the things injected into __builtin__.
r2227 * Brian Granger
"""
#-----------------------------------------------------------------------------
Matthias BUSSONNIER
update copyright to 2011/20xx-2011...
r5390 # Copyright (C) 2008-2011 The IPython Development Team
Brian Granger
Created context manager for the things injected into __builtin__.
r2227 #
# Distributed under the terms of the BSD License. The full license is in
# the file COPYING, distributed as part of this software.
#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Imports
#-----------------------------------------------------------------------------
Brian Granger
Work to address the review comments on Fernando's branch....
r2498
#-----------------------------------------------------------------------------
# Code
#-----------------------------------------------------------------------------
Brian Granger
Created context manager for the things injected into __builtin__.
r2227
class Quitter(object):
"""Simple class to handle exit, similar to Python 2.5's.
It handles exiting in an ipython-safe manner, which the one in Python 2.5
doesn't do (obviously, since it doesn't know about ipython)."""
def __init__(self, shell, name):
self.shell = shell
self.name = name
Fernando Perez
Fix quitting: now, typing bare 'exit' or 'quit' unconditionally quits....
r2370 def __str__(self):
Brian Granger
Created context manager for the things injected into __builtin__.
r2227 return 'Type %s() to exit.' % self.name
def __call__(self):
Fernando Perez
Fix quitting: now, typing bare 'exit' or 'quit' unconditionally quits....
r2370 self.shell.ask_exit()
Fernando Perez
Minor fix to exit/quit
r2379 # Repr MUST return a string, else display like pprint hooks get confused
def __repr__(self):
self.shell.ask_exit()
Brian Granger
Work to address the review comments on Fernando's branch....
r2498 return ''