From de5468b5bd19ded8424b78728c446a49685e1a06 2013-07-02 21:42:40 From: Thomas Kluyver Date: 2013-07-02 21:42:40 Subject: [PATCH] Remove unused imports in IPython.kernel --- diff --git a/IPython/kernel/inprocess/tests/test_kernelmanager.py b/IPython/kernel/inprocess/tests/test_kernelmanager.py index f6cb4bd..ec07d07 100644 --- a/IPython/kernel/inprocess/tests/test_kernelmanager.py +++ b/IPython/kernel/inprocess/tests/test_kernelmanager.py @@ -15,7 +15,6 @@ import unittest # Local imports from IPython.kernel.inprocess.blocking import BlockingInProcessKernelClient -from IPython.kernel.inprocess.ipkernel import InProcessKernel from IPython.kernel.inprocess.manager import InProcessKernelManager #----------------------------------------------------------------------------- diff --git a/IPython/kernel/ioloop/manager.py b/IPython/kernel/ioloop/manager.py index 3a64e65..faacb7e 100644 --- a/IPython/kernel/ioloop/manager.py +++ b/IPython/kernel/ioloop/manager.py @@ -13,7 +13,6 @@ from __future__ import absolute_import -import zmq from zmq.eventloop import ioloop from zmq.eventloop.zmqstream import ZMQStream diff --git a/IPython/kernel/ioloop/restarter.py b/IPython/kernel/ioloop/restarter.py index 947190c..34e2622 100644 --- a/IPython/kernel/ioloop/restarter.py +++ b/IPython/kernel/ioloop/restarter.py @@ -17,13 +17,12 @@ restarts the kernel if it dies. from __future__ import absolute_import -import zmq from zmq.eventloop import ioloop from IPython.kernel.restarter import KernelRestarter from IPython.utils.traitlets import ( - Instance, Float, List, + Instance, ) #----------------------------------------------------------------------------- diff --git a/IPython/kernel/multikernelmanager.py b/IPython/kernel/multikernelmanager.py index 7282e20..e3c2d41 100644 --- a/IPython/kernel/multikernelmanager.py +++ b/IPython/kernel/multikernelmanager.py @@ -26,7 +26,7 @@ import zmq from IPython.config.configurable import LoggingConfigurable from IPython.utils.importstring import import_item from IPython.utils.traitlets import ( - Instance, Dict, Unicode, Any, DottedObjectName, Bool + Instance, Dict, Unicode, Any, DottedObjectName ) #----------------------------------------------------------------------------- diff --git a/IPython/kernel/tests/test_launcher.py b/IPython/kernel/tests/test_launcher.py index 9c005e4..5aa069e 100644 --- a/IPython/kernel/tests/test_launcher.py +++ b/IPython/kernel/tests/test_launcher.py @@ -16,9 +16,6 @@ Authors # Imports #----------------------------------------------------------------------------- -# Stdlib imports -from unittest import TestCase - # Third-party imports import nose.tools as nt diff --git a/IPython/kernel/tests/test_message_spec.py b/IPython/kernel/tests/test_message_spec.py index 47bd922..3dbc6d8 100644 --- a/IPython/kernel/tests/test_message_spec.py +++ b/IPython/kernel/tests/test_message_spec.py @@ -8,8 +8,6 @@ #----------------------------------------------------------------------------- import re -import sys -import time from subprocess import PIPE from Queue import Empty @@ -17,9 +15,7 @@ import nose.tools as nt from IPython.kernel import KernelManager - from IPython.testing import decorators as dec -from IPython.utils import io from IPython.utils.traitlets import ( HasTraits, TraitError, Bool, Unicode, Dict, Integer, List, Enum, Any, ) diff --git a/IPython/kernel/zmq/heartbeat.py b/IPython/kernel/zmq/heartbeat.py index 16e6ce4..a2cad92 100644 --- a/IPython/kernel/zmq/heartbeat.py +++ b/IPython/kernel/zmq/heartbeat.py @@ -14,7 +14,6 @@ import os import socket -import sys from threading import Thread import zmq diff --git a/IPython/kernel/zmq/ipkernel.py b/IPython/kernel/zmq/ipkernel.py index c33b807..2f02d16 100755 --- a/IPython/kernel/zmq/ipkernel.py +++ b/IPython/kernel/zmq/ipkernel.py @@ -25,7 +25,7 @@ import uuid from datetime import datetime from signal import ( - signal, getsignal, default_int_handler, SIGINT, SIG_IGN + signal, default_int_handler, SIGINT ) # System library imports @@ -37,11 +37,10 @@ from zmq.eventloop.zmqstream import ZMQStream from IPython.config.configurable import Configurable from IPython.core.error import StdinNotImplementedError from IPython.core import release -from IPython.utils import io from IPython.utils import py3compat from IPython.utils.jsonutil import json_clean from IPython.utils.traitlets import ( - Any, Instance, Float, Dict, CaselessStrEnum, List, Set, Integer, Unicode, + Any, Instance, Float, Dict, List, Set, Integer, Unicode, Type ) diff --git a/IPython/kernel/zmq/log.py b/IPython/kernel/zmq/log.py index 6d37219..0c72e2c 100644 --- a/IPython/kernel/zmq/log.py +++ b/IPython/kernel/zmq/log.py @@ -1,7 +1,5 @@ -import logging from logging import INFO, DEBUG, WARN, ERROR, FATAL -import zmq from zmq.log.handlers import PUBHandler class EnginePUBHandler(PUBHandler): diff --git a/IPython/kernel/zmq/pylab/backend_inline.py b/IPython/kernel/zmq/pylab/backend_inline.py index 0c08ea8..4e50e6c 100644 --- a/IPython/kernel/zmq/pylab/backend_inline.py +++ b/IPython/kernel/zmq/pylab/backend_inline.py @@ -5,9 +5,6 @@ #----------------------------------------------------------------------------- from __future__ import print_function -# Standard library imports -import sys - # Third-party imports import matplotlib from matplotlib.backends.backend_agg import new_figure_manager, FigureCanvasAgg diff --git a/IPython/kernel/zmq/serialize.py b/IPython/kernel/zmq/serialize.py index 48be41f..a179040 100644 --- a/IPython/kernel/zmq/serialize.py +++ b/IPython/kernel/zmq/serialize.py @@ -15,13 +15,6 @@ Authors: # Imports #----------------------------------------------------------------------------- -# Standard library imports -import logging -import os -import re -import socket -import sys - try: import cPickle pickle = cPickle diff --git a/IPython/kernel/zmq/session.py b/IPython/kernel/zmq/session.py index 60406a4..234dd9d 100644 --- a/IPython/kernel/zmq/session.py +++ b/IPython/kernel/zmq/session.py @@ -44,7 +44,6 @@ from zmq.utils import jsonapi from zmq.eventloop.ioloop import IOLoop from zmq.eventloop.zmqstream import ZMQStream -from IPython.config.application import Application, boolean_flag from IPython.config.configurable import Configurable, LoggingConfigurable from IPython.utils import io from IPython.utils.importstring import import_item diff --git a/IPython/kernel/zmq/zmqshell.py b/IPython/kernel/zmq/zmqshell.py index b3ab8d8..82a4aff 100644 --- a/IPython/kernel/zmq/zmqshell.py +++ b/IPython/kernel/zmq/zmqshell.py @@ -40,12 +40,12 @@ from IPython.kernel import ( get_connection_file, get_connection_info, connect_qtconsole ) from IPython.testing.skipdoctest import skip_doctest -from IPython.utils import io, openpy +from IPython.utils import openpy from IPython.utils.jsonutil import json_clean, encode_images from IPython.utils.process import arg_split from IPython.utils import py3compat from IPython.utils.traitlets import Instance, Type, Dict, CBool, CBytes -from IPython.utils.warn import warn, error +from IPython.utils.warn import error from IPython.kernel.zmq.displayhook import ZMQShellDisplayHook from IPython.kernel.zmq.datapub import ZMQDataPublisher from IPython.kernel.zmq.session import extract_header diff --git a/IPython/utils/pickleutil.py b/IPython/utils/pickleutil.py index 63e4b2c..04ac882 100644 --- a/IPython/utils/pickleutil.py +++ b/IPython/utils/pickleutil.py @@ -30,6 +30,7 @@ try: except: numpy = None +import codeutil # This registers a hook when it's imported import py3compat from importstring import import_item