From 6c47df12e41bd41139ccf79d6f44ae13f4cdfb87 2018-03-10 23:28:03 From: Thomas Kluyver Date: 2018-03-10 23:28:03 Subject: [PATCH] Switch some imports from inputsplitter to inputtransformer2 --- diff --git a/IPython/core/completer.py b/IPython/core/completer.py index 72156e9..b9a78c4 100644 --- a/IPython/core/completer.py +++ b/IPython/core/completer.py @@ -131,7 +131,7 @@ from types import SimpleNamespace from traitlets.config.configurable import Configurable from IPython.core.error import TryNext -from IPython.core.inputsplitter import ESC_MAGIC +from IPython.core.inputtransformer2 import ESC_MAGIC from IPython.core.latex_symbols import latex_symbols, reverse_latex_symbol from IPython.core.oinspect import InspectColors from IPython.utils import generics diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py index d04bb91..f7c0f2e 100644 --- a/IPython/core/interactiveshell.py +++ b/IPython/core/interactiveshell.py @@ -48,7 +48,7 @@ from IPython.core.error import InputRejected, UsageError from IPython.core.extensions import ExtensionManager from IPython.core.formatters import DisplayFormatter from IPython.core.history import HistoryManager -from IPython.core.inputsplitter import ESC_MAGIC, ESC_MAGIC2 +from IPython.core.inputtransformer2 import ESC_MAGIC, ESC_MAGIC2 from IPython.core.logger import Logger from IPython.core.macro import Macro from IPython.core.payload import PayloadManager diff --git a/IPython/core/magic.py b/IPython/core/magic.py index 782063a..c387d4f 100644 --- a/IPython/core/magic.py +++ b/IPython/core/magic.py @@ -19,7 +19,7 @@ from getopt import getopt, GetoptError from traitlets.config.configurable import Configurable from IPython.core import oinspect from IPython.core.error import UsageError -from IPython.core.inputsplitter import ESC_MAGIC, ESC_MAGIC2 +from IPython.core.inputtransformer2 import ESC_MAGIC, ESC_MAGIC2 from decorator import decorator from IPython.utils.ipstruct import Struct from IPython.utils.process import arg_split diff --git a/IPython/core/prefilter.py b/IPython/core/prefilter.py index 255d42a..99632ba 100644 --- a/IPython/core/prefilter.py +++ b/IPython/core/prefilter.py @@ -14,7 +14,7 @@ import re from IPython.core.autocall import IPyAutocall from traitlets.config.configurable import Configurable -from IPython.core.inputsplitter import ( +from IPython.core.inputtransformer2 import ( ESC_MAGIC, ESC_QUOTE, ESC_QUOTE2,