Skip to content

Commit

Permalink
update PR
Browse files Browse the repository at this point in the history
  • Loading branch information
Quentin Peter committed Sep 10, 2023
1 parent 937e7b7 commit feff51d
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 8 deletions.
29 changes: 29 additions & 0 deletions spyder_kernels/console/kernel.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
from zmq.utils.garbage import gc

# Local imports
import spyder_kernels
from spyder_kernels.comms.frontendcomm import FrontendComm
from spyder_kernels.comms.decorators import (
register_comm_handlers, comm_handler)
Expand Down Expand Up @@ -77,6 +78,18 @@ def __init__(self, *args, **kwargs):
# Socket to signal shell_stream locally
self.loopback_socket = None

@property
def kernel_info(self):
# Used for checking correct version by spyder
infos = super().kernel_info
infos.update({
"spyder_kernels_info": (
spyder_kernels.__version__,
sys.executable
)
})
return infos

# -- Public API -----------------------------------------------------------
def frontend_call(self, blocking=False, broadcast=True,
timeout=None, callback=None, display_error=False):
Expand Down Expand Up @@ -620,6 +633,22 @@ def set_configuration(self, dic):
elif value == "light":
self.shell.run_line_magic("colors", "lightbg")
self.set_sympy_forecolor(background_color='light')
elif key == "jedi_completer":
self.set_jedi_completer(value)
elif key == "greedy_completer":
self.set_greedy_completer(value)
elif key == "autocall":
self.set_autocall(value)
elif key == "matplotlib_backend":
self.set_matplotlib_backend(*value)
elif key == "mpl_inline_figure_format":
self.set_mpl_inline_figure_format(value)
elif key == "mpl_inline_resolution":
self.set_mpl_inline_resolution(value)
elif key == "mpl_inline_figure_size":
self.set_mpl_inline_figure_size(*value)
elif key == "mpl_inline_bbox_inches":
self.set_mpl_inline_bbox_inches(value)
return ret

def get_cwd(self):
Expand Down
7 changes: 0 additions & 7 deletions spyder_kernels/console/shell.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
from ipykernel.zmqshell import ZMQInteractiveShell

# Local imports
import spyder_kernels
from spyder_kernels.customize.namespace_manager import NamespaceManager
from spyder_kernels.customize.spyderpdb import SpyderPdb
from spyder_kernels.customize.code_runner import SpyderCodeRunner
Expand Down Expand Up @@ -55,12 +54,6 @@ def __init__(self, *args, **kwargs):
self._allow_kbdint = False
self.register_debugger_sigint()

# Used for checking correct version by spyder
self._spyder_kernels_version = (
spyder_kernels.__version__,
sys.executable
)

# register post_execute
self.events.register('post_execute', self.do_post_execute)

Expand Down
2 changes: 1 addition & 1 deletion spyder_kernels/customize/spyderpdb.py
Original file line number Diff line number Diff line change
Expand Up @@ -861,7 +861,7 @@ def get_pdb_state(self):
hidden = self.hidden_frames(self.stack)
pdb_stack = [f for f, h in zip(pdb_stack, hidden) if not h]
# Adjust the index
pdb_index -= sum([bool(i) for i in hidden[:pdb_index]])
pdb_index -= sum(hidden[:pdb_index])

state['stack'] = (pdb_stack, pdb_index)

Expand Down

0 comments on commit feff51d

Please sign in to comment.