diff --git a/IPython/Extensions/ipy_jot.py b/IPython/Extensions/ipy_jot.py index 60bd5b2..d813146 100644 --- a/IPython/Extensions/ipy_jot.py +++ b/IPython/Extensions/ipy_jot.py @@ -15,7 +15,7 @@ import pickleshare import inspect,pickle,os,sys,textwrap from IPython.core.fakemodule import FakeModule -from IPython.ipstruct import Struct +from IPython.utils.ipstruct import Struct def refresh_variables(ip, key=None): diff --git a/IPython/Magic.py b/IPython/Magic.py index 4c26e0b..e3eae05 100644 --- a/IPython/Magic.py +++ b/IPython/Magic.py @@ -48,7 +48,7 @@ from IPython.core import debugger from IPython.core.fakemodule import FakeModule from IPython.Itpl import Itpl, itpl, printpl,itplns from IPython.PyColorize import Parser -from IPython.ipstruct import Struct +from IPython.utils.ipstruct import Struct from IPython.macro import Macro from IPython.utils.genutils import * from IPython import platutils @@ -3388,7 +3388,7 @@ Defaulting color scheme to 'NoColor'""" # XXX - Fix this to have cleaner activate/deactivate calls. from IPython.Extensions import InterpreterPasteInput as ipaste - from IPython.ipstruct import Struct + from IPython.utils.ipstruct import Struct # Shorthands shell = self.shell diff --git a/IPython/Prompts.py b/IPython/Prompts.py index a3c5947..d76d727 100644 --- a/IPython/Prompts.py +++ b/IPython/Prompts.py @@ -24,7 +24,7 @@ from IPython.utils import coloransi from IPython import Release from IPython.external.Itpl import ItplNS from IPython.core.ipapi import TryNext -from IPython.ipstruct import Struct +from IPython.utils.ipstruct import Struct from IPython.macro import Macro import IPython.utils.generics diff --git a/IPython/Shell.py b/IPython/Shell.py index 768ead6..a311257 100644 --- a/IPython/Shell.py +++ b/IPython/Shell.py @@ -40,7 +40,7 @@ from IPython.Magic import Magic from IPython.utils.genutils import Term,warn,error,flag_calls, ask_yes_no from IPython.core.iplib import InteractiveShell from IPython.core.ipmaker import make_IPython -from IPython.ipstruct import Struct +from IPython.utils.ipstruct import Struct from IPython.testing import decorators as testdec # Globals diff --git a/IPython/config/configloader.py b/IPython/config/configloader.py index f267fad..b6c8bf0 100644 --- a/IPython/config/configloader.py +++ b/IPython/config/configloader.py @@ -14,7 +14,7 @@ import os from pprint import pprint from IPython import ultraTB -from IPython.ipstruct import Struct +from IPython.utils.ipstruct import Struct from IPython.utils.genutils import * class ConfigLoaderError(exceptions.Exception): diff --git a/IPython/core/completer.py b/IPython/core/completer.py index 3689293..9149607 100644 --- a/IPython/core/completer.py +++ b/IPython/core/completer.py @@ -72,7 +72,7 @@ import shlex import sys import IPython.rlineimpl as readline import itertools -from IPython.ipstruct import Struct +from IPython.utils.ipstruct import Struct from IPython.core import ipapi from IPython.utils import generics import types diff --git a/IPython/core/iplib.py b/IPython/core/iplib.py index 4589cad..24e5876 100644 --- a/IPython/core/iplib.py +++ b/IPython/core/iplib.py @@ -53,7 +53,7 @@ from IPython.Itpl import ItplNS from IPython.Logger import Logger from IPython.Magic import Magic from IPython.Prompts import CachedOutput -from IPython.ipstruct import Struct +from IPython.utils.ipstruct import Struct from IPython.lib.backgroundjobs import BackgroundJobManager from IPython.utils.genutils import * from IPython.strdispatch import StrDispatch diff --git a/IPython/core/ipmaker.py b/IPython/core/ipmaker.py index 76ca63e..eba389b 100644 --- a/IPython/core/ipmaker.py +++ b/IPython/core/ipmaker.py @@ -46,7 +46,7 @@ from pprint import pprint # Our own from IPython.utils import DPyGetOpt from IPython import Release -from IPython.ipstruct import Struct +from IPython.utils.ipstruct import Struct from IPython.OutputTrap import OutputTrap from IPython.config.configloader import ConfigLoader from IPython.core.iplib import InteractiveShell diff --git a/IPython/deathrow/twshell.py b/IPython/deathrow/twshell.py index 3a7298c..888001f 100644 --- a/IPython/deathrow/twshell.py +++ b/IPython/deathrow/twshell.py @@ -8,7 +8,7 @@ from twisted.internet import reactor, threads from IPython.core.ipmaker import make_IPython from IPython.core.iplib import InteractiveShell -from IPython.ipstruct import Struct +from IPython.utils.ipstruct import Struct import Queue,thread,threading,signal from signal import signal, SIGINT from IPython.utils.genutils import Term,warn,error,flag_calls, ask_yes_no diff --git a/IPython/kernel/core/ultraTB.py b/IPython/kernel/core/ultraTB.py index 4389d5b..7f4354b 100644 --- a/IPython/kernel/core/ultraTB.py +++ b/IPython/kernel/core/ultraTB.py @@ -92,7 +92,7 @@ from inspect import getsourcefile, getfile, getmodule,\ # Modified pdb which doesn't damage IPython's readline handling from IPython import PyColorize from IPython.core import debugger -from IPython.ipstruct import Struct +from IPython.utils.ipstruct import Struct from IPython.core.excolors import exception_colors from IPython.utils.genutils import Term,uniq_stable,error,info diff --git a/IPython/ultraTB.py b/IPython/ultraTB.py index 45eee93..0b4316b 100644 --- a/IPython/ultraTB.py +++ b/IPython/ultraTB.py @@ -92,7 +92,7 @@ from inspect import getsourcefile, getfile, getmodule,\ # Modified pdb which doesn't damage IPython's readline handling from IPython import PyColorize from IPython.core import debugger -from IPython.ipstruct import Struct +from IPython.utils.ipstruct import Struct from IPython.core.excolors import exception_colors from IPython.utils.genutils import Term,uniq_stable,error,info diff --git a/IPython/utils/coloransi.py b/IPython/utils/coloransi.py index 783aa1d..b756496 100644 --- a/IPython/utils/coloransi.py +++ b/IPython/utils/coloransi.py @@ -13,7 +13,7 @@ __all__ = ['TermColors','InputTermColors','ColorScheme','ColorSchemeTable'] import os -from IPython.ipstruct import Struct +from IPython.utils.ipstruct import Struct def make_color_table(in_class): """Build a set of color attributes in a class. diff --git a/IPython/ipstruct.py b/IPython/utils/ipstruct.py similarity index 100% rename from IPython/ipstruct.py rename to IPython/utils/ipstruct.py diff --git a/IPython/utils/tests/test_imports.py b/IPython/utils/tests/test_imports.py index faf6e90..654bd83 100644 --- a/IPython/utils/tests/test_imports.py +++ b/IPython/utils/tests/test_imports.py @@ -13,5 +13,7 @@ def test_import_generics(): def test_import_genutils(): from IPython.utils import genutils +def test_import_ipstruct(): + from IPython.utils import ipstruct