Show More
@@ -35,7 +35,7 b' from IPython.utils.path import filefind, get_ipython_dir' | |||||
35 | from IPython.utils import py3compat |
|
35 | from IPython.utils import py3compat | |
36 | from IPython.utils.encoding import DEFAULT_ENCODING |
|
36 | from IPython.utils.encoding import DEFAULT_ENCODING | |
37 | from IPython.utils.py3compat import unicode_type, iteritems |
|
37 | from IPython.utils.py3compat import unicode_type, iteritems | |
38 |
from IPython.utils.traitlets import HasTraits, List, Any |
|
38 | from IPython.utils.traitlets import HasTraits, List, Any | |
39 |
|
39 | |||
40 | #----------------------------------------------------------------------------- |
|
40 | #----------------------------------------------------------------------------- | |
41 | # Exceptions |
|
41 | # Exceptions |
@@ -28,7 +28,6 b' Authors:' | |||||
28 | #----------------------------------------------------------------------------- |
|
28 | #----------------------------------------------------------------------------- | |
29 |
|
29 | |||
30 | import atexit |
|
30 | import atexit | |
31 | import errno |
|
|||
32 | import glob |
|
31 | import glob | |
33 | import logging |
|
32 | import logging | |
34 | import os |
|
33 | import os |
@@ -79,7 +79,6 b' from IPython.config.configurable import Configurable' | |||||
79 | from IPython.core.error import TryNext |
|
79 | from IPython.core.error import TryNext | |
80 | from IPython.core.inputsplitter import ESC_MAGIC |
|
80 | from IPython.core.inputsplitter import ESC_MAGIC | |
81 | from IPython.utils import generics |
|
81 | from IPython.utils import generics | |
82 | from IPython.utils import io |
|
|||
83 | from IPython.utils.dir2 import dir2 |
|
82 | from IPython.utils.dir2 import dir2 | |
84 | from IPython.utils.process import arg_split |
|
83 | from IPython.utils.process import arg_split | |
85 | from IPython.utils.py3compat import builtin_mod, string_types |
|
84 | from IPython.utils.py3compat import builtin_mod, string_types |
@@ -35,11 +35,9 b' from IPython.external.decorator import decorator' | |||||
35 | # Our own imports |
|
35 | # Our own imports | |
36 | from IPython.config.configurable import Configurable |
|
36 | from IPython.config.configurable import Configurable | |
37 | from IPython.lib import pretty |
|
37 | from IPython.lib import pretty | |
38 | from IPython.utils import io |
|
|||
39 | from IPython.utils.traitlets import ( |
|
38 | from IPython.utils.traitlets import ( | |
40 | Bool, Dict, Integer, Unicode, CUnicode, ObjectName, List, |
|
39 | Bool, Dict, Integer, Unicode, CUnicode, ObjectName, List, | |
41 | ) |
|
40 | ) | |
42 | from IPython.utils.warn import warn |
|
|||
43 | from IPython.utils.py3compat import ( |
|
41 | from IPython.utils.py3compat import ( | |
44 | unicode_to_str, with_metaclass, PY3, string_types, unicode_type, |
|
42 | unicode_to_str, with_metaclass, PY3, string_types, unicode_type, | |
45 | ) |
|
43 | ) |
@@ -7,7 +7,6 b'' | |||||
7 | import os |
|
7 | import os | |
8 | import shutil |
|
8 | import shutil | |
9 | import errno |
|
9 | import errno | |
10 | import time |
|
|||
11 |
|
10 | |||
12 | from IPython.config.configurable import LoggingConfigurable |
|
11 | from IPython.config.configurable import LoggingConfigurable | |
13 | from IPython.utils.path import get_ipython_package_dir, expand_path, ensure_dir_exists |
|
12 | from IPython.utils.path import get_ipython_package_dir, expand_path, ensure_dir_exists |
@@ -20,7 +20,6 b' from __future__ import print_function' | |||||
20 | # Imports |
|
20 | # Imports | |
21 | #----------------------------------------------------------------------------- |
|
21 | #----------------------------------------------------------------------------- | |
22 |
|
22 | |||
23 | import sys |
|
|||
24 | from io import BytesIO |
|
23 | from io import BytesIO | |
25 |
|
24 | |||
26 | from IPython.core.display import _pngxy |
|
25 | from IPython.core.display import _pngxy |
@@ -35,7 +35,7 b' from IPython.utils import py3compat' | |||||
35 | from IPython.utils.contexts import preserve_keys |
|
35 | from IPython.utils.contexts import preserve_keys | |
36 | from IPython.utils.path import filefind |
|
36 | from IPython.utils.path import filefind | |
37 | from IPython.utils.traitlets import ( |
|
37 | from IPython.utils.traitlets import ( | |
38 |
Unicode, Instance, List, Bool, CaselessStrEnum |
|
38 | Unicode, Instance, List, Bool, CaselessStrEnum | |
39 | ) |
|
39 | ) | |
40 | from IPython.lib.inputhook import guis |
|
40 | from IPython.lib.inputhook import guis | |
41 |
|
41 |
@@ -34,7 +34,6 b' else:' | |||||
34 | import os |
|
34 | import os | |
35 | import sys |
|
35 | import sys | |
36 |
|
36 | |||
37 | from IPython.utils.warn import warn |
|
|||
38 | from IPython.utils.version import check_version |
|
37 | from IPython.utils.version import check_version | |
39 | from IPython.external.qt_loaders import (load_qt, QT_API_PYSIDE, |
|
38 | from IPython.external.qt_loaders import (load_qt, QT_API_PYSIDE, | |
40 | QT_API_PYQT, QT_API_PYQT_DEFAULT, |
|
39 | QT_API_PYQT, QT_API_PYQT_DEFAULT, |
@@ -7,11 +7,8 b' from tornado import web' | |||||
7 | from ..base.handlers import IPythonHandler, notebook_path_regex |
|
7 | from ..base.handlers import IPythonHandler, notebook_path_regex | |
8 | from IPython.nbformat.current import to_notebook_json |
|
8 | from IPython.nbformat.current import to_notebook_json | |
9 |
|
9 | |||
10 | from IPython.utils import tz |
|
|||
11 | from IPython.utils.py3compat import cast_bytes |
|
10 | from IPython.utils.py3compat import cast_bytes | |
12 |
|
11 | |||
13 | import sys |
|
|||
14 |
|
||||
15 | def find_resource_files(output_files_dir): |
|
12 | def find_resource_files(output_files_dir): | |
16 | files = [] |
|
13 | files = [] | |
17 | for dirpath, dirnames, filenames in os.walk(output_files_dir): |
|
14 | for dirpath, dirnames, filenames in os.walk(output_files_dir): | |
@@ -137,4 +134,4 b' default_handlers = [' | |||||
137 | (r"/nbconvert/%s%s" % (_format_regex, notebook_path_regex), |
|
134 | (r"/nbconvert/%s%s" % (_format_regex, notebook_path_regex), | |
138 | NbconvertFileHandler), |
|
135 | NbconvertFileHandler), | |
139 | (r"/nbconvert/%s" % _format_regex, NbconvertPostHandler), |
|
136 | (r"/nbconvert/%s" % _format_regex, NbconvertPostHandler), | |
140 | ] No newline at end of file |
|
137 | ] |
@@ -21,9 +21,7 b' import os' | |||||
21 | from tornado import web |
|
21 | from tornado import web | |
22 |
|
22 | |||
23 | from IPython.kernel.multikernelmanager import MultiKernelManager |
|
23 | from IPython.kernel.multikernelmanager import MultiKernelManager | |
24 |
from IPython.utils.traitlets import |
|
24 | from IPython.utils.traitlets import List, Unicode, TraitError | |
25 | Dict, List, Unicode, |
|
|||
26 | ) |
|
|||
27 |
|
25 | |||
28 | from IPython.html.utils import to_os_path |
|
26 | from IPython.html.utils import to_os_path | |
29 | from IPython.utils.py3compat import getcwd |
|
27 | from IPython.utils.py3compat import getcwd |
@@ -1,10 +1,6 b'' | |||||
1 | """Test the kernels service API.""" |
|
1 | """Test the kernels service API.""" | |
2 |
|
2 | |||
3 |
|
3 | |||
4 | import os |
|
|||
5 | import sys |
|
|||
6 | import json |
|
|||
7 |
|
||||
8 | import requests |
|
4 | import requests | |
9 |
|
5 | |||
10 | from IPython.html.utils import url_path_join |
|
6 | from IPython.html.utils import url_path_join |
@@ -15,11 +15,9 b' Authors:' | |||||
15 | #----------------------------------------------------------------------------- |
|
15 | #----------------------------------------------------------------------------- | |
16 | # Imports |
|
16 | # Imports | |
17 | #----------------------------------------------------------------------------- |
|
17 | #----------------------------------------------------------------------------- | |
18 | import os |
|
|||
19 |
|
||||
20 | from tornado import web |
|
18 | from tornado import web | |
21 | from ..base.handlers import IPythonHandler, notebook_path_regex, path_regex |
|
19 | from ..base.handlers import IPythonHandler, notebook_path_regex, path_regex | |
22 |
from ..utils import url_path_join, |
|
20 | from ..utils import url_path_join, url_escape | |
23 |
|
21 | |||
24 | #----------------------------------------------------------------------------- |
|
22 | #----------------------------------------------------------------------------- | |
25 | # Handlers |
|
23 | # Handlers |
@@ -21,7 +21,6 b' from IPython.utils.traitlets import (' | |||||
21 | Unicode, List, Instance, DottedObjectName, Type, CaselessStrEnum, |
|
21 | Unicode, List, Instance, DottedObjectName, Type, CaselessStrEnum, | |
22 | ) |
|
22 | ) | |
23 | from IPython.utils.importstring import import_item |
|
23 | from IPython.utils.importstring import import_item | |
24 | from IPython.utils.text import dedent |
|
|||
25 |
|
24 | |||
26 | from .exporters.export import get_export_names, exporter_map |
|
25 | from .exporters.export import get_export_names, exporter_map | |
27 | from IPython.nbconvert import exporters, preprocessors, writers, postprocessors |
|
26 | from IPython.nbconvert import exporters, preprocessors, writers, postprocessors |
@@ -16,8 +16,6 b' Authors:' | |||||
16 | # Imports |
|
16 | # Imports | |
17 | #----------------------------------------------------------------------------- |
|
17 | #----------------------------------------------------------------------------- | |
18 |
|
18 | |||
19 | import re |
|
|||
20 |
|
||||
21 | from .reader import get_version, versions |
|
19 | from .reader import get_version, versions | |
22 |
|
20 | |||
23 | #----------------------------------------------------------------------------- |
|
21 | #----------------------------------------------------------------------------- |
@@ -16,19 +16,11 b' Authors:' | |||||
16 | # Imports |
|
16 | # Imports | |
17 | #----------------------------------------------------------------------------- |
|
17 | #----------------------------------------------------------------------------- | |
18 |
|
18 | |||
19 |
|
||||
20 | import logging |
|
|||
21 | import os |
|
|||
22 |
|
||||
23 | import zmq |
|
|||
24 | from zmq.eventloop.ioloop import IOLoop |
|
|||
25 |
|
||||
26 | from IPython.config.configurable import Configurable |
|
|||
27 | from IPython.utils.localinterfaces import localhost |
|
19 | from IPython.utils.localinterfaces import localhost | |
28 |
from IPython.utils.traitlets import Integer, |
|
20 | from IPython.utils.traitlets import Integer, Unicode | |
29 |
|
21 | |||
30 | from IPython.parallel.util import select_random_ports |
|
22 | from IPython.parallel.util import select_random_ports | |
31 |
from IPython.kernel.zmq.session import |
|
23 | from IPython.kernel.zmq.session import SessionFactory | |
32 |
|
24 | |||
33 | #----------------------------------------------------------------------------- |
|
25 | #----------------------------------------------------------------------------- | |
34 | # Classes |
|
26 | # Classes |
@@ -33,9 +33,7 b' from IPython.config.application import Application' | |||||
33 | from IPython.utils.localinterfaces import localhost, is_public_ip, public_ips |
|
33 | from IPython.utils.localinterfaces import localhost, is_public_ip, public_ips | |
34 | from IPython.utils.py3compat import string_types, iteritems, itervalues |
|
34 | from IPython.utils.py3compat import string_types, iteritems, itervalues | |
35 | from IPython.kernel.zmq.log import EnginePUBHandler |
|
35 | from IPython.kernel.zmq.log import EnginePUBHandler | |
36 | from IPython.kernel.zmq.serialize import ( |
|
36 | ||
37 | unserialize_object, serialize_object, pack_apply_message, unpack_apply_message |
|
|||
38 | ) |
|
|||
39 |
|
37 | |||
40 | #----------------------------------------------------------------------------- |
|
38 | #----------------------------------------------------------------------------- | |
41 | # Classes |
|
39 | # Classes | |
@@ -387,4 +385,4 b' def set_hwm(sock, hwm=0):' | |||||
387 | except zmq.ZMQError: |
|
385 | except zmq.ZMQError: | |
388 | pass |
|
386 | pass | |
389 |
|
387 | |||
390 | No newline at end of file |
|
388 |
@@ -30,9 +30,7 b' import logging' | |||||
30 | import os |
|
30 | import os | |
31 | import sys |
|
31 | import sys | |
32 |
|
32 | |||
33 |
from IPython.config.loader import |
|
33 | from IPython.config.loader import Config | |
34 | Config, PyFileConfigLoader, ConfigFileNotFound |
|
|||
35 | ) |
|
|||
36 | from IPython.config.application import boolean_flag, catch_config_error, Application |
|
34 | from IPython.config.application import boolean_flag, catch_config_error, Application | |
37 | from IPython.core import release |
|
35 | from IPython.core import release | |
38 | from IPython.core import usage |
|
36 | from IPython.core import usage |
@@ -35,7 +35,7 b' License: MIT open source license.' | |||||
35 | from __future__ import print_function |
|
35 | from __future__ import print_function | |
36 |
|
36 | |||
37 | from IPython.external.path import path as Path |
|
37 | from IPython.external.path import path as Path | |
38 |
import |
|
38 | import stat, time | |
39 | import collections |
|
39 | import collections | |
40 | try: |
|
40 | try: | |
41 | import cPickle as pickle |
|
41 | import cPickle as pickle |
@@ -18,7 +18,6 b' from __future__ import print_function' | |||||
18 | # Stdlib |
|
18 | # Stdlib | |
19 | import os |
|
19 | import os | |
20 | import sys |
|
20 | import sys | |
21 | import shlex |
|
|||
22 |
|
21 | |||
23 | # Our own |
|
22 | # Our own | |
24 | if sys.platform == 'win32': |
|
23 | if sys.platform == 'win32': |
@@ -15,7 +15,6 b' something like \'current\' as a stable URL for the most current version of the """' | |||||
15 | # Imports |
|
15 | # Imports | |
16 | #----------------------------------------------------------------------------- |
|
16 | #----------------------------------------------------------------------------- | |
17 | import os |
|
17 | import os | |
18 | import re |
|
|||
19 | import shutil |
|
18 | import shutil | |
20 | import sys |
|
19 | import sys | |
21 | from os import chdir as cd |
|
20 | from os import chdir as cd |
@@ -33,7 +33,7 b" the trait's events for all of the config=True attributes." | |||||
33 | from IPython.config.configurable import Configurable |
|
33 | from IPython.config.configurable import Configurable | |
34 | from IPython.config.application import Application |
|
34 | from IPython.config.application import Application | |
35 | from IPython.utils.traitlets import ( |
|
35 | from IPython.utils.traitlets import ( | |
36 |
Bool, Unicode, Int, |
|
36 | Bool, Unicode, Int, List, Dict | |
37 | ) |
|
37 | ) | |
38 |
|
38 | |||
39 |
|
39 |
@@ -14,7 +14,7 b' __docformat__ = "restructuredtext en"' | |||||
14 | # Imports |
|
14 | # Imports | |
15 | #------------------------------------------------------------------------------- |
|
15 | #------------------------------------------------------------------------------- | |
16 |
|
16 | |||
17 |
import sys |
|
17 | import sys | |
18 | from textwrap import fill |
|
18 | from textwrap import fill | |
19 |
|
19 | |||
20 | display_status=True |
|
20 | display_status=True |
@@ -12,8 +12,6 b' To generate a report for IPython 2.0, run:' | |||||
12 | from __future__ import print_function |
|
12 | from __future__ import print_function | |
13 |
|
13 | |||
14 | import codecs |
|
14 | import codecs | |
15 | import json |
|
|||
16 | import re |
|
|||
17 | import sys |
|
15 | import sys | |
18 |
|
16 | |||
19 | from argparse import ArgumentParser |
|
17 | from argparse import ArgumentParser |
@@ -4,10 +4,8 b'' | |||||
4 |
|
4 | |||
5 | import commands |
|
5 | import commands | |
6 | import os |
|
6 | import os | |
7 | import sys |
|
|||
8 | import shutil |
|
|||
9 |
|
7 | |||
10 |
from |
|
8 | from toollib import cd, sh | |
11 |
|
9 | |||
12 | tag = commands.getoutput('git describe --tags') |
|
10 | tag = commands.getoutput('git describe --tags') | |
13 | base_name = 'ipython-%s' % tag |
|
11 | base_name = 'ipython-%s' % tag |
General Comments 0
You need to be logged in to leave comments.
Login now