Merge from 3.x: PR #7462

Fixes #7404
spyder-ide · Jul 16, 2018 · 30cd0f3 · 30cd0f3
2 parents 5bd22d5 + e86db99
commit 30cd0f3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/spyder/widgets/ipythonconsole/shell.py b/spyder/widgets/ipythonconsole/shell.py
@@ -251,6 +251,7 @@ def reset_namespace(self, warning=False, silent=True, message=False):
             # Update checkbox based on user interaction
             CONF.set('ipython_console', 'show_reset_namespace_warning',
                      not box.is_checked())
+            self.ipyclient.reset_warning = not box.is_checked()
 
             if answer != QMessageBox.Yes:
                 return

diff --git a/spyder/widgets/shell.py b/spyder/widgets/shell.py
@@ -24,7 +24,7 @@
 from qtpy.compat import getsavefilename
 from qtpy.QtCore import Property, QCoreApplication, Qt, QTimer, Signal, Slot
 from qtpy.QtGui import QKeySequence, QTextCharFormat, QTextCursor
-from qtpy.QtWidgets import QApplication, QMenu, QMessageBox, QToolTip
+from qtpy.QtWidgets import QApplication, QMenu, QToolTip
 
 # Local import
 from spyder.config.base import _, DEBUG, get_conf_path, STDERR