From a2bf752dba26d2d93cb54777afb96272d0f25e9b Mon Sep 17 00:00:00 2001 From: Thomas Kluyver Date: Tue, 2 Jul 2013 22:31:40 +0100 Subject: [PATCH 1/3] Remove unused imports in IPython.html --- IPython/html/notebookapp.py | 2 -- IPython/html/services/clusters/clustermanager.py | 2 -- IPython/html/services/kernels/kernelmanager.py | 2 +- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/IPython/html/notebookapp.py b/IPython/html/notebookapp.py index c3d3f11c5..f0d77055b 100644 --- a/IPython/html/notebookapp.py +++ b/IPython/html/notebookapp.py @@ -27,7 +27,6 @@ import socket import sys import threading import time -import uuid import webbrowser @@ -36,7 +35,6 @@ import webbrowser from IPython.utils.zmqrelated import check_for_zmq check_for_zmq('2.1.11', 'IPython.html') -import zmq from jinja2 import Environment, FileSystemLoader # Install the pyzmq ioloop. This has to be done before anything else from diff --git a/IPython/html/services/clusters/clustermanager.py b/IPython/html/services/clusters/clustermanager.py index 404eaf40a..3b12a1a6c 100644 --- a/IPython/html/services/clusters/clustermanager.py +++ b/IPython/html/services/clusters/clustermanager.py @@ -22,13 +22,11 @@ from tornado import web from zmq.eventloop import ioloop from IPython.config.configurable import LoggingConfigurable -from IPython.config.loader import load_pyconfig_files from IPython.utils.traitlets import Dict, Instance, CFloat from IPython.parallel.apps.ipclusterapp import IPClusterStart from IPython.core.profileapp import list_profiles_in from IPython.core.profiledir import ProfileDir from IPython.utils.path import get_ipython_dir -from IPython.utils.sysinfo import num_cpus #----------------------------------------------------------------------------- diff --git a/IPython/html/services/kernels/kernelmanager.py b/IPython/html/services/kernels/kernelmanager.py index ed1c03ec0..93ba04df9 100644 --- a/IPython/html/services/kernels/kernelmanager.py +++ b/IPython/html/services/kernels/kernelmanager.py @@ -20,7 +20,7 @@ from tornado import web from IPython.kernel.multikernelmanager import MultiKernelManager from IPython.utils.traitlets import ( - Dict, List, Unicode, Integer, + Dict, List, Unicode, ) #----------------------------------------------------------------------------- From 1b66bd96155c7073a4a88782687bef7b44176799 Mon Sep 17 00:00:00 2001 From: Thomas Kluyver Date: Tue, 2 Jul 2013 23:00:28 +0100 Subject: [PATCH 2/3] Remove unused imports in IPython.testing --- IPython/testing/iptest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IPython/testing/iptest.py b/IPython/testing/iptest.py index c2b7bee08..d05fd4e30 100644 --- a/IPython/testing/iptest.py +++ b/IPython/testing/iptest.py @@ -57,7 +57,7 @@ from nose.core import TestProgram from IPython.utils import py3compat from IPython.utils.importstring import import_item from IPython.utils.path import get_ipython_module_path, get_ipython_package_dir -from IPython.utils.process import find_cmd, pycmd2argv +from IPython.utils.process import pycmd2argv from IPython.utils.sysinfo import sys_info from IPython.utils.tempdir import TemporaryDirectory from IPython.utils.warn import warn From 679458f3b99643503e14549335878987861e871b Mon Sep 17 00:00:00 2001 From: Thomas Kluyver Date: Tue, 2 Jul 2013 23:03:29 +0100 Subject: [PATCH 3/3] Fix test import --- IPython/utils/tests/test_io.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/IPython/utils/tests/test_io.py b/IPython/utils/tests/test_io.py index 86ba86459..221fdb427 100644 --- a/IPython/utils/tests/test_io.py +++ b/IPython/utils/tests/test_io.py @@ -20,7 +20,7 @@ from subprocess import Popen, PIPE import nose.tools as nt -from IPython.testing import decorators as dec +from IPython.testing.ipunittest import ParametricTestCase from IPython.utils.io import Tee, capture_output from IPython.utils.py3compat import doctest_refactor_print @@ -38,7 +38,7 @@ def test_tee_simple(): nt.assert_equal(chan.getvalue(), text+"\n") -class TeeTestCase(dec.ParametricTestCase): +class TeeTestCase(ParametricTestCase): def tchan(self, channel, check='close'): trap = StringIO()