Skip to content

Commit

Permalink
git subrepo clone --branch=separate_cmd_input --force https://github.…
Browse files Browse the repository at this point in the history
…com/impact27/spyder-kernels.git external-deps/spyder-kernels

subrepo:
  subdir:   "external-deps/spyder-kernels"
  merged:   "2d00f0fb5"
upstream:
  origin:   "https://github.com/impact27/spyder-kernels.git"
  branch:   "separate_cmd_input"
  commit:   "2d00f0fb5"
git-subrepo:
  version:  "0.4.1"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "a04d8c2"
  • Loading branch information
Quentin Peter committed Jul 2, 2020
1 parent 431c058 commit 21c44e4
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 9 deletions.
4 changes: 2 additions & 2 deletions external-deps/spyder-kernels/.gitrepo
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[subrepo]
remote = https://github.com/spyder-ide/spyder-kernels.git
branch = separate_cmd_input
commit = 3db419b1ca9464e44e49d52acc03317e009fa23a
parent = 837b84c64c03d2f791bff41fb90f073a308c04ec
commit = 2d00f0fb54f3238ed05c2348004c101e31abf02e
parent = 431c05888a5f211042e4c99d9b83a25f11f63bc1
method = merge
cmdver = 0.4.1
Original file line number Diff line number Diff line change
Expand Up @@ -171,11 +171,10 @@ def _wait_reply(self, call_id, call_name, timeout, retry=True):
def reply_recieved():
"""The reply is there!"""
return call_id in self._reply_inbox

# Send config again just in case
self._send_comm_config()
if not self.wait_until(reply_recieved):
if retry:
# Send config again just in case
self._send_comm_config()
self._wait_reply(call_id, call_name, timeout, False)
return
raise TimeoutError(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,7 @@ def __init__(self, completekey='tab', stdin=None, stdout=None,
self._echo_stack_entry = True
super(SpyderPdb, self).__init__()
self._pdb_breaking = False
print('\x1b[31mImportant: The spyder debugger separates'
' user code from commands.')
print('To enter a Pdb command, prefix a "!".')
print('\x1b[0m')
self._warning_printed = False

# --- Methods overriden for code execution
def default(self, line):
Expand Down Expand Up @@ -264,6 +261,14 @@ def preloop(self):
self.set_spyder_breakpoints(pdb_settings['breakpoints'])
except (CommError, TimeoutError):
logger.debug("Could not get breakpoints from the frontend.")
if not self._warning_printed:
print('\x1b[31mImportant: The spyder debugger separates'
' user code from commands.')
print('To enter a Pdb command, prefix a "!".')
print('\x1b[0m')
self._warning_printed = True

super(SpyderPdb, self).preloop()

def postloop(self):
"""Notifies spyder that the loop has ended."""
Expand Down

0 comments on commit 21c44e4

Please sign in to comment.