Merge pull request ipython#8756 from Achifaifa/master

takluyver · takluyver · commit 2d5daf6643cb · 2015-08-21T18:40:29.000-07:00
Fixed exit confirmation glitch
diff --git a/.gitignore b/.gitignore
@@ -20,3 +20,4 @@ __pycache__
 \#*#
 .#*
 .coverage
+*.swp
diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
@@ -3252,10 +3252,10 @@ def write_err(self,data):
         """Write a string to the default error output"""
         io.stderr.write(data)
 
-    def ask_yes_no(self, prompt, default=None):
+    def ask_yes_no(self, prompt, default=None, interrupt=None):
         if self.quiet:
             return True
-        return ask_yes_no(prompt,default)
+        return ask_yes_no(prompt,default,interrupt)
 
     def show_usage(self):
         """Show a usage message"""
diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
@@ -617,7 +617,7 @@ def exit(self):
 
         This method calls the ask_exit callback."""
         if self.confirm_exit:
-            if self.ask_yes_no('Do you really want to exit ([y]/n)?','y'):
+            if self.ask_yes_no('Do you really want to exit ([y]/n)?','y','n'):
                 self.ask_exit()
         else:
             self.ask_exit()

-Original file line number
+Diff line change
 \#*#
 .#*
 .coverage
 +*.swp