Skip to content

Don't show %guiref in banner #101

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.

Sign up for GitHub

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

Merged
minrk merged 1 commit into from
Feb 15, 2016
Merged

Don't show %guiref in banner #101

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions ipykernel/zmqshell.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
from IPython.core.magics import MacroToEdit, CodeMagics
from IPython.core.magic import magics_class, line_magic, Magics
from IPython.core import payloadpage
from IPython.core.usage import default_gui_banner
from IPython.core.usage import default_banner
Copy link
Member

@ccordoba12 ccordoba12 Feb 15, 2016

Choose a reason for hiding this comment

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

I'd prefer that we could do the removal of default_gui_banner in the next minor IPython release instead of the next major one (given that's such a small change).

So I propose to enclose this in a try/except block, like this:

try:
    from IPython.core.usage import default_gui_banner as default_banner
except ImportError:
    from IPython.core.usage import default_banner

Copy link
Member Author

@takluyver takluyver Feb 15, 2016

Choose a reason for hiding this comment

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

The try/except is not necessary, because default_banner was already defined. The issue is that the IPython release that removes default_gui_banner will break compatibility with any ipykernel releases before this PR is merged, including at least ipykernel 4.2.2, the current release. So I don't think we should backport that change to a 4.x release.

Why would it be a problem to have a couple of unused variables sitting in IPython, anyway?

Copy link
Member

@ccordoba12 ccordoba12 Feb 15, 2016

Choose a reason for hiding this comment

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

Sorry, I was thinking that a new release of ipykernel would be hold until IPython 5.0 is ready.

But you're right, default_banner is present in previous IPython releases, so there's no problem with this change :-)

from IPython.display import display, Javascript
from ipykernel import (
get_connection_file, get_connection_info, connect_qtconsole
Expand Down Expand Up @@ -350,7 +350,7 @@ class ZMQInteractiveShell(InteractiveShell):
parent_header = Any()

def _banner1_default(self):
return default_gui_banner
return default_banner

# Override the traitlet in the parent class, because there's no point using
# readline for the kernel. Can be removed when the readline code is moved
Expand Down