From: Georg Brandl <georg@python.org>
Date: Thu, 9 Mar 2006 23:22:06 +0000 (+0000)
Subject: Patch #1446372: quit and exit can now be called from the interactive
X-Git-Tag: v2.5a0~294
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=24cb053b158a3cd63f7be05ac27f47e45bb2f1b3;p=thirdparty%2FPython%2Fcpython.git

Patch #1446372: quit and exit can now be called from the interactive
interpreter to exit.
---

diff --git a/Lib/site.py b/Lib/site.py
index 2207ec59cdc0..3fc75377b12c 100644
--- a/Lib/site.py
+++ b/Lib/site.py
@@ -227,12 +227,21 @@ def setquit():
 
     """
     if os.sep == ':':
-        exit = 'Use Cmd-Q to quit.'
+        eof = 'Cmd-Q'
     elif os.sep == '\\':
-        exit = 'Use Ctrl-Z plus Return to exit.'
+        eof = 'Ctrl-Z plus Return'
     else:
-        exit = 'Use Ctrl-D (i.e. EOF) to exit.'
-    __builtin__.quit = __builtin__.exit = exit
+        eof = 'Ctrl-D (i.e. EOF)'
+    
+    class Quitter(object):
+        def __init__(self, name):
+            self.name = name
+        def __repr__(self):
+            return 'Use %s() or %s to exit' % (self.name, eof)
+        def __call__(self, code=None):
+            raise SystemExit(code)
+    __builtin__.quit = Quitter('quit')
+    __builtin__.exit = Quitter('exit')
 
 
 class _Printer(object):
diff --git a/Misc/NEWS b/Misc/NEWS
index ed4e97be7a50..0ed682a4f45f 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,9 @@ What's New in Python 2.5 alpha 1?
 Core and builtins
 -----------------
 
+- Patch #1446372: quit and exit can now be called from the interactive
+  interpreter to exit.
+
 - Patch #1434038: property() now uses the getter's docstring if there is
   no "doc" argument given. This makes it possible to legitimately use
   property() as a decorator to produce a read-only property.