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