Skip to content

Make less use of ipython_genutils #631

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
blink1073 merged 1 commit into from
Apr 9, 2021
Merged

Make less use of ipython_genutils #631

Show file tree
Hide file tree
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
3 changes: 1 addition & 2 deletions ipykernel/ipkernel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import sys

from IPython.core import release
from ipython_genutils.py3compat import safe_unicode
from IPython.utils.tokenutil import token_at_cursor, line_at_cursor
from tornado import gen
from traitlets import Instance, Type, Any, List, Bool, observe, observe_compat
Expand Down Expand Up @@ -351,7 +350,7 @@ def run_cell(*args, **kwargs):
reply_content.update({
'traceback': shell._last_traceback or [],
'ename': str(type(err).__name__),
'evalue': safe_unicode(err),
'evalue': str(err),
})

# FIXME: deprecated piece for ipyparallel (remove in 5.0):
Expand Down
3 changes: 1 addition & 2 deletions ipykernel/zmqshell.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
from IPython.utils import openpy
from ipykernel.jsonutil import json_clean, encode_images
from IPython.utils.process import arg_split, system
from ipython_genutils import py3compat
from traitlets import (
Instance, Type, Dict, CBool, CBytes, Any, default, observe
)
Expand Down Expand Up @@ -546,7 +545,7 @@ def _showtraceback(self, etype, evalue, stb):
exc_content = {
'traceback' : stb,
'ename' : str(etype.__name__),
'evalue' : py3compat.safe_unicode(evalue),
'evalue' : str(evalue),
}

dh = self.displayhook
Expand Down