Show More
@@ -15,7 +15,7 b' import pickleshare' | |||
|
15 | 15 | |
|
16 | 16 | import inspect,pickle,os,sys,textwrap |
|
17 | 17 | from IPython.core.fakemodule import FakeModule |
|
18 | from IPython.ipstruct import Struct | |
|
18 | from IPython.utils.ipstruct import Struct | |
|
19 | 19 | |
|
20 | 20 | |
|
21 | 21 | def refresh_variables(ip, key=None): |
@@ -48,7 +48,7 b' from IPython.core import debugger' | |||
|
48 | 48 | from IPython.core.fakemodule import FakeModule |
|
49 | 49 | from IPython.Itpl import Itpl, itpl, printpl,itplns |
|
50 | 50 | from IPython.PyColorize import Parser |
|
51 | from IPython.ipstruct import Struct | |
|
51 | from IPython.utils.ipstruct import Struct | |
|
52 | 52 | from IPython.macro import Macro |
|
53 | 53 | from IPython.utils.genutils import * |
|
54 | 54 | from IPython import platutils |
@@ -3388,7 +3388,7 b' Defaulting color scheme to \'NoColor\'"""' | |||
|
3388 | 3388 | |
|
3389 | 3389 | # XXX - Fix this to have cleaner activate/deactivate calls. |
|
3390 | 3390 | from IPython.Extensions import InterpreterPasteInput as ipaste |
|
3391 | from IPython.ipstruct import Struct | |
|
3391 | from IPython.utils.ipstruct import Struct | |
|
3392 | 3392 | |
|
3393 | 3393 | # Shorthands |
|
3394 | 3394 | shell = self.shell |
@@ -24,7 +24,7 b' from IPython.utils import coloransi' | |||
|
24 | 24 | from IPython import Release |
|
25 | 25 | from IPython.external.Itpl import ItplNS |
|
26 | 26 | from IPython.core.ipapi import TryNext |
|
27 | from IPython.ipstruct import Struct | |
|
27 | from IPython.utils.ipstruct import Struct | |
|
28 | 28 | from IPython.macro import Macro |
|
29 | 29 | import IPython.utils.generics |
|
30 | 30 |
@@ -40,7 +40,7 b' from IPython.Magic import Magic' | |||
|
40 | 40 | from IPython.utils.genutils import Term,warn,error,flag_calls, ask_yes_no |
|
41 | 41 | from IPython.core.iplib import InteractiveShell |
|
42 | 42 | from IPython.core.ipmaker import make_IPython |
|
43 | from IPython.ipstruct import Struct | |
|
43 | from IPython.utils.ipstruct import Struct | |
|
44 | 44 | from IPython.testing import decorators as testdec |
|
45 | 45 | |
|
46 | 46 | # Globals |
@@ -14,7 +14,7 b' import os' | |||
|
14 | 14 | from pprint import pprint |
|
15 | 15 | |
|
16 | 16 | from IPython import ultraTB |
|
17 | from IPython.ipstruct import Struct | |
|
17 | from IPython.utils.ipstruct import Struct | |
|
18 | 18 | from IPython.utils.genutils import * |
|
19 | 19 | |
|
20 | 20 | class ConfigLoaderError(exceptions.Exception): |
@@ -72,7 +72,7 b' import shlex' | |||
|
72 | 72 | import sys |
|
73 | 73 | import IPython.rlineimpl as readline |
|
74 | 74 | import itertools |
|
75 | from IPython.ipstruct import Struct | |
|
75 | from IPython.utils.ipstruct import Struct | |
|
76 | 76 | from IPython.core import ipapi |
|
77 | 77 | from IPython.utils import generics |
|
78 | 78 | import types |
@@ -53,7 +53,7 b' from IPython.Itpl import ItplNS' | |||
|
53 | 53 | from IPython.Logger import Logger |
|
54 | 54 | from IPython.Magic import Magic |
|
55 | 55 | from IPython.Prompts import CachedOutput |
|
56 | from IPython.ipstruct import Struct | |
|
56 | from IPython.utils.ipstruct import Struct | |
|
57 | 57 | from IPython.lib.backgroundjobs import BackgroundJobManager |
|
58 | 58 | from IPython.utils.genutils import * |
|
59 | 59 | from IPython.strdispatch import StrDispatch |
@@ -46,7 +46,7 b' from pprint import pprint' | |||
|
46 | 46 | # Our own |
|
47 | 47 | from IPython.utils import DPyGetOpt |
|
48 | 48 | from IPython import Release |
|
49 | from IPython.ipstruct import Struct | |
|
49 | from IPython.utils.ipstruct import Struct | |
|
50 | 50 | from IPython.OutputTrap import OutputTrap |
|
51 | 51 | from IPython.config.configloader import ConfigLoader |
|
52 | 52 | from IPython.core.iplib import InteractiveShell |
@@ -8,7 +8,7 b' from twisted.internet import reactor, threads' | |||
|
8 | 8 | |
|
9 | 9 | from IPython.core.ipmaker import make_IPython |
|
10 | 10 | from IPython.core.iplib import InteractiveShell |
|
11 | from IPython.ipstruct import Struct | |
|
11 | from IPython.utils.ipstruct import Struct | |
|
12 | 12 | import Queue,thread,threading,signal |
|
13 | 13 | from signal import signal, SIGINT |
|
14 | 14 | from IPython.utils.genutils import Term,warn,error,flag_calls, ask_yes_no |
@@ -92,7 +92,7 b' from inspect import getsourcefile, getfile, getmodule,\\' | |||
|
92 | 92 | # Modified pdb which doesn't damage IPython's readline handling |
|
93 | 93 | from IPython import PyColorize |
|
94 | 94 | from IPython.core import debugger |
|
95 | from IPython.ipstruct import Struct | |
|
95 | from IPython.utils.ipstruct import Struct | |
|
96 | 96 | from IPython.core.excolors import exception_colors |
|
97 | 97 | from IPython.utils.genutils import Term,uniq_stable,error,info |
|
98 | 98 |
@@ -92,7 +92,7 b' from inspect import getsourcefile, getfile, getmodule,\\' | |||
|
92 | 92 | # Modified pdb which doesn't damage IPython's readline handling |
|
93 | 93 | from IPython import PyColorize |
|
94 | 94 | from IPython.core import debugger |
|
95 | from IPython.ipstruct import Struct | |
|
95 | from IPython.utils.ipstruct import Struct | |
|
96 | 96 | from IPython.core.excolors import exception_colors |
|
97 | 97 | from IPython.utils.genutils import Term,uniq_stable,error,info |
|
98 | 98 |
@@ -13,7 +13,7 b" __all__ = ['TermColors','InputTermColors','ColorScheme','ColorSchemeTable']" | |||
|
13 | 13 | |
|
14 | 14 | import os |
|
15 | 15 | |
|
16 | from IPython.ipstruct import Struct | |
|
16 | from IPython.utils.ipstruct import Struct | |
|
17 | 17 | |
|
18 | 18 | def make_color_table(in_class): |
|
19 | 19 | """Build a set of color attributes in a class. |
|
1 | NO CONTENT: file renamed from IPython/ipstruct.py to IPython/utils/ipstruct.py |
General Comments 0
You need to be logged in to leave comments.
Login now