Skip to content

Commit

Permalink
Merge from 3.x: PR #4248
Browse files Browse the repository at this point in the history
Fixes #4233
  • Loading branch information
ccordoba12 committed Mar 11, 2017
2 parents a2159a9 + 9c4766e commit 1be1b9c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
5 changes: 0 additions & 5 deletions spyder/plugins/externalconsole.py
Original file line number Diff line number Diff line change
Expand Up @@ -706,11 +706,6 @@ def process_started(self, shell_id):
self.tabwidget.setTabIcon(index, icon)
if self.help is not None:
self.help.set_shell(shell.shell)
shell.shell.write("NOTE: The Python console is going to "
"be REMOVED in Spyder 3.2. Please start "
"to migrate your work to the "
"IPython console instead.\n\n", prompt=True)
shell.shell.new_prompt("")

def process_finished(self, shell_id):
index = self.get_shell_index_from_id(shell_id)
Expand Down
4 changes: 4 additions & 0 deletions spyder/widgets/shell.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,10 @@ def __init__(self, parent, history_filename, profile=False):

# Buffer to increase performance of write/flush operations
self.__buffer = []
self.__buffer.append("NOTE: The Python console is going to "
"be REMOVED in Spyder 3.2. Please start "
"to migrate your work to the "
"IPython console instead.\n\n")
self.__timestamp = 0.0
self.__flushtimer = QTimer(self)
self.__flushtimer.setSingleShot(True)
Expand Down

0 comments on commit 1be1b9c

Please sign in to comment.