Show More
@@ -30,7 +30,6 b' from IPython.config.configurable import Configurable' | |||||
30 | from IPython.core.splitinput import split_user_input |
|
30 | from IPython.core.splitinput import split_user_input | |
31 |
|
31 | |||
32 | from IPython.utils.traitlets import List, Instance |
|
32 | from IPython.utils.traitlets import List, Instance | |
33 | from IPython.utils.autoattr import auto_attr |
|
|||
34 | from IPython.utils.warn import warn, error |
|
33 | from IPython.utils.warn import warn, error | |
35 |
|
34 | |||
36 | #----------------------------------------------------------------------------- |
|
35 | #----------------------------------------------------------------------------- |
@@ -74,7 +74,6 b' import itertools' | |||||
74 | import keyword |
|
74 | import keyword | |
75 | import os |
|
75 | import os | |
76 | import re |
|
76 | import re | |
77 | import shlex |
|
|||
78 | import sys |
|
77 | import sys | |
79 |
|
78 | |||
80 | from IPython.config.configurable import Configurable |
|
79 | from IPython.config.configurable import Configurable |
@@ -30,7 +30,6 b' from zipimport import zipimporter' | |||||
30 | # Our own imports |
|
30 | # Our own imports | |
31 | from IPython.core.completer import expand_user, compress_user |
|
31 | from IPython.core.completer import expand_user, compress_user | |
32 | from IPython.core.error import TryNext |
|
32 | from IPython.core.error import TryNext | |
33 | from IPython.utils import py3compat |
|
|||
34 | from IPython.utils._process_common import arg_split |
|
33 | from IPython.utils._process_common import arg_split | |
35 |
|
34 | |||
36 | # FIXME: this should be pulled in with the right call via the component system |
|
35 | # FIXME: this should be pulled in with the right call via the component system |
@@ -33,7 +33,7 b' import sys' | |||||
33 |
|
33 | |||
34 | from IPython.utils import PyColorize, ulinecache |
|
34 | from IPython.utils import PyColorize, ulinecache | |
35 | from IPython.core import ipapi |
|
35 | from IPython.core import ipapi | |
36 |
from IPython.utils import coloransi, io, |
|
36 | from IPython.utils import coloransi, io, py3compat | |
37 | from IPython.core.excolors import exception_colors |
|
37 | from IPython.core.excolors import exception_colors | |
38 |
|
38 | |||
39 | # See if we can use pydb. |
|
39 | # See if we can use pydb. |
@@ -30,7 +30,7 b' import sys' | |||||
30 |
|
30 | |||
31 | from IPython.config.configurable import Configurable |
|
31 | from IPython.config.configurable import Configurable | |
32 | from IPython.utils import io |
|
32 | from IPython.utils import io | |
33 |
from IPython.utils.traitlets import Instance |
|
33 | from IPython.utils.traitlets import Instance | |
34 | from IPython.utils.warn import warn |
|
34 | from IPython.utils.warn import warn | |
35 |
|
35 | |||
36 | #----------------------------------------------------------------------------- |
|
36 | #----------------------------------------------------------------------------- |
@@ -8,7 +8,6 b'' | |||||
8 | #***************************************************************************** |
|
8 | #***************************************************************************** | |
9 |
|
9 | |||
10 | import re |
|
10 | import re | |
11 | import sys |
|
|||
12 |
|
11 | |||
13 | from IPython.utils import py3compat |
|
12 | from IPython.utils import py3compat | |
14 | from IPython.utils.encoding import DEFAULT_ENCODING |
|
13 | from IPython.utils.encoding import DEFAULT_ENCODING |
@@ -31,7 +31,7 b' from IPython.utils.ipstruct import Struct' | |||||
31 | from IPython.utils.process import arg_split |
|
31 | from IPython.utils.process import arg_split | |
32 | from IPython.utils.text import dedent |
|
32 | from IPython.utils.text import dedent | |
33 | from IPython.utils.traitlets import Bool, Dict, Instance, MetaHasTraits |
|
33 | from IPython.utils.traitlets import Bool, Dict, Instance, MetaHasTraits | |
34 |
from IPython.utils.warn import error |
|
34 | from IPython.utils.warn import error | |
35 |
|
35 | |||
36 | #----------------------------------------------------------------------------- |
|
36 | #----------------------------------------------------------------------------- | |
37 | # Globals |
|
37 | # Globals |
@@ -25,7 +25,6 b' from IPython.core.macro import Macro' | |||||
25 | from IPython.core.magic import Magics, magics_class, line_magic |
|
25 | from IPython.core.magic import Magics, magics_class, line_magic | |
26 | from IPython.core.oinspect import find_file, find_source_lines |
|
26 | from IPython.core.oinspect import find_file, find_source_lines | |
27 | from IPython.testing.skipdoctest import skip_doctest |
|
27 | from IPython.testing.skipdoctest import skip_doctest | |
28 | from IPython.utils import openpy |
|
|||
29 | from IPython.utils import py3compat |
|
28 | from IPython.utils import py3compat | |
30 | from IPython.utils.contexts import preserve_keys |
|
29 | from IPython.utils.contexts import preserve_keys | |
31 | from IPython.utils.io import file_read |
|
30 | from IPython.utils.io import file_read |
@@ -14,7 +14,7 b'' | |||||
14 | # Our own packages |
|
14 | # Our own packages | |
15 | from IPython.core.display import display, Javascript, Latex, SVG |
|
15 | from IPython.core.display import display, Javascript, Latex, SVG | |
16 | from IPython.core.magic import ( |
|
16 | from IPython.core.magic import ( | |
17 |
Magics, magics_class, |
|
17 | Magics, magics_class, cell_magic | |
18 | ) |
|
18 | ) | |
19 |
|
19 | |||
20 | #----------------------------------------------------------------------------- |
|
20 | #----------------------------------------------------------------------------- |
@@ -16,7 +16,6 b' from __future__ import print_function' | |||||
16 | # Stdlib |
|
16 | # Stdlib | |
17 | import os |
|
17 | import os | |
18 | from io import open as io_open |
|
18 | from io import open as io_open | |
19 | from IPython.external.argparse import Action |
|
|||
20 |
|
19 | |||
21 | # Our own packages |
|
20 | # Our own packages | |
22 | from IPython.core.error import StdinNotImplementedError |
|
21 | from IPython.core.error import StdinNotImplementedError |
@@ -26,14 +26,14 b' from pprint import pformat' | |||||
26 | from IPython.core import magic_arguments |
|
26 | from IPython.core import magic_arguments | |
27 | from IPython.core import oinspect |
|
27 | from IPython.core import oinspect | |
28 | from IPython.core import page |
|
28 | from IPython.core import page | |
29 |
from IPython.core.error import UsageError |
|
29 | from IPython.core.error import UsageError | |
30 | from IPython.core.magic import ( |
|
30 | from IPython.core.magic import ( | |
31 | Magics, compress_dhist, magics_class, line_magic, cell_magic, line_cell_magic |
|
31 | Magics, compress_dhist, magics_class, line_magic, cell_magic, line_cell_magic | |
32 | ) |
|
32 | ) | |
33 | from IPython.testing.skipdoctest import skip_doctest |
|
33 | from IPython.testing.skipdoctest import skip_doctest | |
34 |
from IPython.utils.io import |
|
34 | from IPython.utils.io import nlprint | |
35 | from IPython.utils.openpy import source_to_unicode |
|
35 | from IPython.utils.openpy import source_to_unicode | |
36 |
from IPython.utils.path import |
|
36 | from IPython.utils.path import unquote_filename | |
37 | from IPython.utils.process import abbrev_cwd |
|
37 | from IPython.utils.process import abbrev_cwd | |
38 | from IPython.utils.terminal import set_term_title |
|
38 | from IPython.utils.terminal import set_term_title | |
39 | #----------------------------------------------------------------------------- |
|
39 | #----------------------------------------------------------------------------- |
@@ -14,7 +14,6 b'' | |||||
14 | # Stdlib |
|
14 | # Stdlib | |
15 | import errno |
|
15 | import errno | |
16 | import os |
|
16 | import os | |
17 | import re |
|
|||
18 | import sys |
|
17 | import sys | |
19 | import signal |
|
18 | import signal | |
20 | import time |
|
19 | import time | |
@@ -24,12 +23,10 b' import atexit' | |||||
24 | # Our own packages |
|
23 | # Our own packages | |
25 | from IPython.config.configurable import Configurable |
|
24 | from IPython.config.configurable import Configurable | |
26 | from IPython.core import magic_arguments |
|
25 | from IPython.core import magic_arguments | |
27 | from IPython.core.error import UsageError |
|
|||
28 | from IPython.core.magic import ( |
|
26 | from IPython.core.magic import ( | |
29 | Magics, magics_class, line_magic, cell_magic |
|
27 | Magics, magics_class, line_magic, cell_magic | |
30 | ) |
|
28 | ) | |
31 | from IPython.lib.backgroundjobs import BackgroundJobManager |
|
29 | from IPython.lib.backgroundjobs import BackgroundJobManager | |
32 | from IPython.testing.skipdoctest import skip_doctest |
|
|||
33 | from IPython.utils import py3compat |
|
30 | from IPython.utils import py3compat | |
34 | from IPython.utils.process import arg_split |
|
31 | from IPython.utils.process import arg_split | |
35 | from IPython.utils.traitlets import List, Dict |
|
32 | from IPython.utils.traitlets import List, Dict |
@@ -29,7 +29,6 b' from __future__ import print_function' | |||||
29 |
|
29 | |||
30 | import os |
|
30 | import os | |
31 | import re |
|
31 | import re | |
32 | import subprocess |
|
|||
33 | import sys |
|
32 | import sys | |
34 | import tempfile |
|
33 | import tempfile | |
35 |
|
34 |
@@ -24,11 +24,8 b' Authors:' | |||||
24 | # Imports |
|
24 | # Imports | |
25 | #----------------------------------------------------------------------------- |
|
25 | #----------------------------------------------------------------------------- | |
26 |
|
26 | |||
27 | import __builtin__ |
|
|||
28 | import codeop |
|
|||
29 | import re |
|
27 | import re | |
30 |
|
28 | |||
31 | from IPython.core.alias import AliasManager |
|
|||
32 | from IPython.core.autocall import IPyAutocall |
|
29 | from IPython.core.autocall import IPyAutocall | |
33 | from IPython.config.configurable import Configurable |
|
30 | from IPython.config.configurable import Configurable | |
34 | from IPython.core.inputsplitter import ( |
|
31 | from IPython.core.inputsplitter import ( | |
@@ -42,13 +39,11 b' from IPython.core.inputsplitter import (' | |||||
42 | ESC_PAREN, |
|
39 | ESC_PAREN, | |
43 | ) |
|
40 | ) | |
44 | from IPython.core.macro import Macro |
|
41 | from IPython.core.macro import Macro | |
45 |
from IPython.core.splitinput import |
|
42 | from IPython.core.splitinput import LineInfo | |
46 | from IPython.core import page |
|
|||
47 |
|
43 | |||
48 | from IPython.utils.traitlets import ( |
|
44 | from IPython.utils.traitlets import ( | |
49 |
List, Integer |
|
45 | List, Integer, Unicode, CBool, Bool, Instance, CRegExp | |
50 | ) |
|
46 | ) | |
51 | from IPython.utils.autoattr import auto_attr |
|
|||
52 |
|
47 | |||
53 | #----------------------------------------------------------------------------- |
|
48 | #----------------------------------------------------------------------------- | |
54 | # Global utilities, errors and constants |
|
49 | # Global utilities, errors and constants |
@@ -21,12 +21,11 b' Authors:' | |||||
21 | # Imports |
|
21 | # Imports | |
22 | #----------------------------------------------------------------------------- |
|
22 | #----------------------------------------------------------------------------- | |
23 |
|
23 | |||
24 | import logging |
|
|||
25 | import os |
|
24 | import os | |
26 |
|
25 | |||
27 |
from IPython.config.application import Application |
|
26 | from IPython.config.application import Application | |
28 | from IPython.core.application import ( |
|
27 | from IPython.core.application import ( | |
29 |
BaseIPythonApplication, base_flags |
|
28 | BaseIPythonApplication, base_flags | |
30 | ) |
|
29 | ) | |
31 | from IPython.core.profiledir import ProfileDir |
|
30 | from IPython.core.profiledir import ProfileDir | |
32 | from IPython.utils.path import get_ipython_dir, get_ipython_package_dir |
|
31 | from IPython.utils.path import get_ipython_dir, get_ipython_package_dir |
@@ -23,12 +23,10 b' Authors:' | |||||
23 |
|
23 | |||
24 | import os |
|
24 | import os | |
25 | import shutil |
|
25 | import shutil | |
26 | import sys |
|
|||
27 |
|
26 | |||
28 | from IPython.config.configurable import LoggingConfigurable |
|
27 | from IPython.config.configurable import LoggingConfigurable | |
29 | from IPython.config.loader import Config |
|
|||
30 | from IPython.utils.path import get_ipython_package_dir, expand_path |
|
28 | from IPython.utils.path import get_ipython_package_dir, expand_path | |
31 |
from IPython.utils.traitlets import |
|
29 | from IPython.utils.traitlets import Unicode, Bool | |
32 |
|
30 | |||
33 | #----------------------------------------------------------------------------- |
|
31 | #----------------------------------------------------------------------------- | |
34 | # Classes and functions |
|
32 | # Classes and functions |
@@ -109,7 +109,6 b' from IPython.utils import py3compat' | |||||
109 | from IPython.utils import pyfile |
|
109 | from IPython.utils import pyfile | |
110 | from IPython.utils import ulinecache |
|
110 | from IPython.utils import ulinecache | |
111 | from IPython.utils.data import uniq_stable |
|
111 | from IPython.utils.data import uniq_stable | |
112 | from IPython.utils.openpy import read_py_file |
|
|||
113 | from IPython.utils.warn import info, error |
|
112 | from IPython.utils.warn import info, error | |
114 |
|
113 | |||
115 | # Globals |
|
114 | # Globals |
@@ -34,7 +34,7 b' import sys' | |||||
34 | import threading |
|
34 | import threading | |
35 |
|
35 | |||
36 | from IPython.core.ultratb import AutoFormattedTB |
|
36 | from IPython.core.ultratb import AutoFormattedTB | |
37 |
from IPython.utils.warn import |
|
37 | from IPython.utils.warn import error | |
38 |
|
38 | |||
39 |
|
39 | |||
40 | class BackgroundJobManager(object): |
|
40 | class BackgroundJobManager(object): |
@@ -2,7 +2,6 b'' | |||||
2 | """ |
|
2 | """ | |
3 |
|
3 | |||
4 | import subprocess |
|
4 | import subprocess | |
5 | import sys |
|
|||
6 |
|
5 | |||
7 | from IPython.core.error import TryNext |
|
6 | from IPython.core.error import TryNext | |
8 | import IPython.utils.py3compat as py3compat |
|
7 | import IPython.utils.py3compat as py3compat |
@@ -183,9 +183,8 b' import re' | |||||
183 | import shlex |
|
183 | import shlex | |
184 | import sys |
|
184 | import sys | |
185 |
|
185 | |||
186 | from IPython.utils.PyColorize import Parser |
|
|||
187 | from IPython.utils import io |
|
186 | from IPython.utils import io | |
188 |
from IPython.utils.io import file_read |
|
187 | from IPython.utils.io import file_read | |
189 | from IPython.utils.text import marquee |
|
188 | from IPython.utils.text import marquee | |
190 | from IPython.utils import openpy |
|
189 | from IPython.utils import openpy | |
191 | __all__ = ['Demo','IPythonDemo','LineDemo','IPythonLineDemo','DemoError'] |
|
190 | __all__ = ['Demo','IPythonDemo','LineDemo','IPythonLineDemo','DemoError'] |
@@ -17,9 +17,7 b' Authors: Robin Dunn, Brian Granger, Ondrej Certik' | |||||
17 | # Imports |
|
17 | # Imports | |
18 | #----------------------------------------------------------------------------- |
|
18 | #----------------------------------------------------------------------------- | |
19 |
|
19 | |||
20 | import os |
|
|||
21 | import signal |
|
20 | import signal | |
22 | import sys |
|
|||
23 | import time |
|
21 | import time | |
24 | from timeit import default_timer as clock |
|
22 | from timeit import default_timer as clock | |
25 | import wx |
|
23 | import wx |
@@ -26,7 +26,7 b' import subprocess' | |||||
26 |
|
26 | |||
27 | from IPython.utils.process import find_cmd, FindCmdError |
|
27 | from IPython.utils.process import find_cmd, FindCmdError | |
28 | from IPython.config.configurable import SingletonConfigurable |
|
28 | from IPython.config.configurable import SingletonConfigurable | |
29 |
from IPython.utils.traitlets import |
|
29 | from IPython.utils.traitlets import List, CBool, CUnicode | |
30 | from IPython.utils.py3compat import bytes_to_str |
|
30 | from IPython.utils.py3compat import bytes_to_str | |
31 |
|
31 | |||
32 | #----------------------------------------------------------------------------- |
|
32 | #----------------------------------------------------------------------------- |
@@ -24,7 +24,6 b' from IPython.external import pexpect' | |||||
24 | # Our own |
|
24 | # Our own | |
25 | from .autoattr import auto_attr |
|
25 | from .autoattr import auto_attr | |
26 | from ._process_common import getoutput, arg_split |
|
26 | from ._process_common import getoutput, arg_split | |
27 | from IPython.utils import text |
|
|||
28 | from IPython.utils import py3compat |
|
27 | from IPython.utils import py3compat | |
29 | from IPython.utils.encoding import DEFAULT_ENCODING |
|
28 | from IPython.utils.encoding import DEFAULT_ENCODING | |
30 |
|
29 |
@@ -28,7 +28,6 b' from subprocess import STDOUT' | |||||
28 | # our own imports |
|
28 | # our own imports | |
29 | from ._process_common import read_no_interrupt, process_handler, arg_split as py_arg_split |
|
29 | from ._process_common import read_no_interrupt, process_handler, arg_split as py_arg_split | |
30 | from . import py3compat |
|
30 | from . import py3compat | |
31 | from . import text |
|
|||
32 | from .encoding import DEFAULT_ENCODING |
|
31 | from .encoding import DEFAULT_ENCODING | |
33 |
|
32 | |||
34 | #----------------------------------------------------------------------------- |
|
33 | #----------------------------------------------------------------------------- |
@@ -13,7 +13,6 b'' | |||||
13 | # stdlib |
|
13 | # stdlib | |
14 | import math |
|
14 | import math | |
15 | import re |
|
15 | import re | |
16 | import sys |
|
|||
17 | import types |
|
16 | import types | |
18 | from datetime import datetime |
|
17 | from datetime import datetime | |
19 |
|
18 | |||
@@ -26,7 +25,6 b' except ImportError:' | |||||
26 |
|
25 | |||
27 | from IPython.utils import py3compat |
|
26 | from IPython.utils import py3compat | |
28 | from IPython.utils.encoding import DEFAULT_ENCODING |
|
27 | from IPython.utils.encoding import DEFAULT_ENCODING | |
29 | from IPython.utils import text |
|
|||
30 | next_attr_name = '__next__' if py3compat.PY3 else 'next' |
|
28 | next_attr_name = '__next__' if py3compat.PY3 else 'next' | |
31 |
|
29 | |||
32 | #----------------------------------------------------------------------------- |
|
30 | #----------------------------------------------------------------------------- |
@@ -30,7 +30,6 b' try:' | |||||
30 | except: |
|
30 | except: | |
31 | numpy = None |
|
31 | numpy = None | |
32 |
|
32 | |||
33 | import codeutil |
|
|||
34 | import py3compat |
|
33 | import py3compat | |
35 | from importstring import import_item |
|
34 | from importstring import import_item | |
36 |
|
35 |
@@ -28,7 +28,6 b' else:' | |||||
28 |
|
28 | |||
29 |
|
29 | |||
30 | from ._process_common import getoutputerror |
|
30 | from ._process_common import getoutputerror | |
31 | from IPython.utils import py3compat |
|
|||
32 |
|
31 | |||
33 | #----------------------------------------------------------------------------- |
|
32 | #----------------------------------------------------------------------------- | |
34 | # Code |
|
33 | # Code |
@@ -9,14 +9,9 b' In addition to normal readline stuff, this module provides have_readline' | |||||
9 | boolean and _outputfile variable used in IPython.utils. |
|
9 | boolean and _outputfile variable used in IPython.utils. | |
10 | """ |
|
10 | """ | |
11 |
|
11 | |||
12 | import os |
|
|||
13 | import re |
|
|||
14 | import sys |
|
12 | import sys | |
15 | import time |
|
|||
16 | import warnings |
|
13 | import warnings | |
17 |
|
14 | |||
18 | from subprocess import Popen, PIPE |
|
|||
19 |
|
||||
20 | if sys.platform == 'darwin': |
|
15 | if sys.platform == 'darwin': | |
21 | # dirty trick, to skip the system readline, because pip-installed readline |
|
16 | # dirty trick, to skip the system readline, because pip-installed readline | |
22 | # will never be found on OSX, since lib-dynload always comes ahead of site-packages |
|
17 | # will never be found on OSX, since lib-dynload always comes ahead of site-packages |
@@ -20,8 +20,6 b' import pprint' | |||||
20 | import sys |
|
20 | import sys | |
21 | import subprocess |
|
21 | import subprocess | |
22 |
|
22 | |||
23 | from ConfigParser import ConfigParser |
|
|||
24 |
|
||||
25 | from IPython.core import release |
|
23 | from IPython.core import release | |
26 | from IPython.utils import py3compat, _sysinfo, encoding |
|
24 | from IPython.utils import py3compat, _sysinfo, encoding | |
27 |
|
25 |
General Comments 0
You need to be logged in to leave comments.
Login now