Commit e36804d0 authored by Stefan Behnel's avatar Stefan Behnel

Merge branch '0.23.x'

parents 591199d1 05509f78
...@@ -70,7 +70,11 @@ from IPython.core import display ...@@ -70,7 +70,11 @@ from IPython.core import display
from IPython.core import magic_arguments from IPython.core import magic_arguments
from IPython.core.magic import Magics, magics_class, cell_magic from IPython.core.magic import Magics, magics_class, cell_magic
from IPython.utils import py3compat from IPython.utils import py3compat
from IPython.utils.path import get_ipython_cache_dir try:
from IPython.paths import get_ipython_cache_dir
except ImportError:
# older IPython version
from IPython.utils.path import get_ipython_cache_dir
from IPython.utils.text import dedent from IPython.utils.text import dedent
from ..Shadow import __version__ as cython_version from ..Shadow import __version__ as cython_version
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment