Permalink
Browse files

Merge pull request #9765 from takluyver/noopcontext-for-ipykernel

Restore NoOpContext location for ipykernel to import
  • Loading branch information...
takluyver committed Jul 15, 2016
2 parents e8a9430 + 7cda396 commit 1057988c17cd2ded9599d90eaf9857dada8163e2
Showing with 4 additions and 0 deletions.
  1. +4 −0 IPython/core/interactiveshell.py
@@ -82,6 +82,10 @@
from logging import error
import IPython.core.hooks
# NoOpContext is deprecated, but ipykernel imports it from here.
# See https://github.com/ipython/ipykernel/issues/157
from IPython.utils.contexts import NoOpContext
try:
import docrepr.sphinxify as sphx

0 comments on commit 1057988

Please sign in to comment.