Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for the gf shell. Supports newer versions of IPython, v3.11+ #414

Merged
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions host/greatfet/commands/greatfet_shell.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
from greatfet.util.interactive import GreatFETShellMagics

import IPython
from IPython.terminal.interactiveshell import TerminalInteractiveShell

def main():

Expand Down Expand Up @@ -69,7 +68,12 @@ def main():


# Create a new shell, and give it access to our created GreatFET object.
shell = TerminalInteractiveShell()
# Apr 18 2023 - Changed method for creating the shell, to support changes in IPython v8.11+
# - ref. https://github.com/ipython/ipython/issues/13966
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You've already done a great job of documenting this in the PR itself so it doesn't need to be in the code as well.

Copy link
Contributor Author

@RichardEWillis RichardEWillis May 5, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated the PR, Python comment removed. Please review and close this PR comment if it looks good.

if IPython.core.getipython.get_ipython() is None:
shell = IPython.terminal.embed.InteractiveShellEmbed.instance()
else:
shell = IPython.terminal.embed.InteractiveShellEmbed()
shell.push('gf')

# Create nice aliases for our primary interfaces.
Expand Down