ipstruct.py => utils/ipstruct.py and imports updated.

IPython/Extensions/ipy_jot.py

@@ -15,7 +15,7 b' 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):

IPython/Magic.py

@@ -48,7 +48,7 b' 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 b' 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

IPython/Prompts.py

@@ -24,7 +24,7 b' 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
 

IPython/Shell.py

@@ -40,7 +40,7 b' 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

IPython/config/configloader.py

@@ -14,7 +14,7 b' 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):

IPython/core/completer.py

@@ -72,7 +72,7 b' 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

IPython/core/iplib.py

@@ -53,7 +53,7 b' 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

IPython/core/ipmaker.py

@@ -46,7 +46,7 b' 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

IPython/deathrow/twshell.py

@@ -8,7 +8,7 b' 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

IPython/kernel/core/ultraTB.py

@@ -92,7 +92,7 b' 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
 

IPython/ultraTB.py

@@ -92,7 +92,7 b' 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
 

IPython/utils/coloransi.py

@@ -13,7 +13,7 b" __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.

IPython/utils/tests/test_imports.py

@@ -13,5 +13,7 b' def test_import_generics():'
 def test_import_genutils():
     from IPython.utils import genutils
 
+def test_import_ipstruct():
+    from IPython.utils import ipstruct