Remove unused imports from IPython.core

takluyver · takluyver · commit 9567c77aa0a0 · 2013-07-02T21:37:17.000+01:00
diff --git a/IPython/core/extensions.py b/IPython/core/extensions.py
@@ -21,7 +21,6 @@
 from shutil import copyfile
 import sys
 
-from IPython.core.error import UsageError
 from IPython.config.configurable import Configurable
 from IPython.utils.traitlets import Instance
 from IPython.utils.py3compat import PY3
diff --git a/IPython/core/getipython.py b/IPython/core/getipython.py
@@ -9,12 +9,6 @@
 #  the file COPYING, distributed as part of this software.
 #-----------------------------------------------------------------------------
 
-#-----------------------------------------------------------------------------
-# Imports
-#-----------------------------------------------------------------------------
-
-import warnings
-
 #-----------------------------------------------------------------------------
 # Classes and functions
 #-----------------------------------------------------------------------------
diff --git a/IPython/core/inputsplitter.py b/IPython/core/inputsplitter.py
@@ -71,7 +71,6 @@
 import sys
 
 # IPython modules
-from IPython.core.splitinput import split_user_input, LineInfo
 from IPython.utils.py3compat import cast_unicode
 from IPython.core.inputtransformer import (leading_indent,
                                            classic_prompt,
@@ -85,7 +84,7 @@
                                            assemble_python_lines,
                                            )
 
-# Temporary!
+# These are available in this module for backwards compatibility.
 from IPython.core.inputtransformer import (ESC_SHELL, ESC_SH_CAP, ESC_HELP,
                                         ESC_HELP2, ESC_MAGIC, ESC_MAGIC2,
                                         ESC_QUOTE, ESC_QUOTE2, ESC_PAREN, ESC_SEQUENCES)
diff --git a/IPython/core/inputtransformer.py b/IPython/core/inputtransformer.py
@@ -3,7 +3,7 @@
 import re
 from StringIO import StringIO
 
-from IPython.core.splitinput import split_user_input, LineInfo
+from IPython.core.splitinput import LineInfo
 from IPython.utils import tokenize2
 from IPython.utils.tokenize2 import generate_tokens, untokenize, TokenError
 
diff --git a/IPython/core/magic.py b/IPython/core/magic.py
@@ -15,7 +15,6 @@
 # Imports
 #-----------------------------------------------------------------------------
 # Stdlib
-import json
 import os
 import re
 import sys
diff --git a/IPython/core/magics/basic.py b/IPython/core/magics/basic.py
@@ -20,11 +20,10 @@
 from pprint import pformat
 
 # Our own packages
-from IPython.core import magic_arguments
+from IPython.core import magic_arguments, page
 from IPython.core.error import UsageError
 from IPython.core.magic import Magics, magics_class, line_magic, magic_escapes
 from IPython.utils.text import format_screen, dedent, indent
-from IPython.core import magic_arguments, page
 from IPython.testing.skipdoctest import skip_doctest
 from IPython.utils.ipstruct import Struct
 from IPython.utils.path import unquote_filename
diff --git a/IPython/core/oinspect.py b/IPython/core/oinspect.py
@@ -18,15 +18,12 @@
 __all__ = ['Inspector','InspectColors']
 
 # stdlib modules
-import __builtin__
 import inspect
 import linecache
 import os
-import sys
 import types
 import io as stdlib_io
 
-from collections import namedtuple
 try:
     from itertools import izip_longest
 except ImportError:
diff --git a/IPython/core/prefilter.py b/IPython/core/prefilter.py
@@ -29,11 +29,7 @@
 from IPython.core.autocall import IPyAutocall
 from IPython.config.configurable import Configurable
 from IPython.core.inputsplitter import (
-    ESC_SHELL,
-    ESC_SH_CAP,
-    ESC_HELP,
     ESC_MAGIC,
-    ESC_MAGIC2,
     ESC_QUOTE,
     ESC_QUOTE2,
     ESC_PAREN,
diff --git a/IPython/core/tests/test_completerlib.py b/IPython/core/tests/test_completerlib.py
@@ -15,11 +15,7 @@
 import unittest
 from os.path import join
 
-import nose.tools as nt
-from nose import SkipTest
-
 from IPython.core.completerlib import magic_run_completer, module_completion
-from IPython.utils import py3compat
 from IPython.utils.tempdir import TemporaryDirectory
 
 
diff --git a/IPython/core/tests/test_debugger.py b/IPython/core/tests/test_debugger.py
@@ -122,7 +122,7 @@ def test_ipdb_magics():
     ipdb> continue
     '''
 
-def test_ipdb_magics():
+def test_ipdb_magics2():
     '''Test ipdb with a very short function.
 
     >>> def bar():
diff --git a/IPython/core/tests/test_fakemodule.py b/IPython/core/tests/test_fakemodule.py
@@ -3,7 +3,7 @@
 
 import nose.tools as nt
 
-from IPython.core.fakemodule import FakeModule, init_fakemod_dict
+from IPython.core.fakemodule import FakeModule
 
 # Make a fakemod and check a few properties
 def test_mk_fakemod():
diff --git a/IPython/core/tests/test_formatters.py b/IPython/core/tests/test_formatters.py
@@ -9,8 +9,7 @@
     numpy = None
 import nose.tools as nt
 
-from IPython.core.formatters import FormatterABC, PlainTextFormatter
-from IPython.lib import pretty
+from IPython.core.formatters import PlainTextFormatter
 
 class A(object):
     def __repr__(self):
diff --git a/IPython/core/tests/test_history.py b/IPython/core/tests/test_history.py
@@ -7,10 +7,8 @@
 
 # stdlib
 import os
-import shutil
 import sys
 import tempfile
-import unittest
 from datetime import datetime
 
 # third party
diff --git a/IPython/core/tests/test_inputsplitter.py b/IPython/core/tests/test_inputsplitter.py
@@ -388,14 +388,6 @@ def test_multi(self):
         self.check_ns(['x =(1+','1+','2)'], dict(x=4))
 
 
-def test_LineInfo():
-    """Simple test for LineInfo construction and str()"""
-    linfo = isp.LineInfo('  %cd /home')
-    nt.assert_equal(str(linfo), 'LineInfo [  |%|cd|/home]')
-
-
-
-
 class IPythonInputTestCase(InputSplitterTestCase):
     """By just creating a new class whose .isp is a different instance, we
     re-run the same test battery on the new input splitter.
diff --git a/IPython/core/tests/test_inputtransformer.py b/IPython/core/tests/test_inputtransformer.py
@@ -1,5 +1,4 @@
 import tokenize
-import unittest
 import nose.tools as nt
 
 from IPython.testing import tools as tt
diff --git a/IPython/core/tests/test_iplib.py b/IPython/core/tests/test_iplib.py
@@ -4,17 +4,11 @@
 # Module imports
 #-----------------------------------------------------------------------------
 
-# stdlib
-import os
-import shutil
-import tempfile
-
 # third party
 import nose.tools as nt
 
 # our own packages
 from IPython.testing.globalipapp import get_ipython
-from IPython.utils import py3compat
 
 #-----------------------------------------------------------------------------
 # Globals
diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py
@@ -476,8 +476,6 @@ def test_timeit_arguments():
 
 def test_timeit_special_syntax():
     "Test %%timeit with IPython special syntax"
-    from IPython.core.magic import register_line_magic
-
     @register_line_magic
     def lmagic(line):
         ip = get_ipython()
diff --git a/IPython/core/tests/test_oinspect.py b/IPython/core/tests/test_oinspect.py
@@ -208,7 +208,7 @@ def test_calltip_cell_magic():
     check_calltip(cmagic, 'cmagic', 'cmagic(line, cell)', "A cell magic")
 
         
-def test_calltip_line_magic():
+def test_calltip_line_cell_magic():
     check_calltip(lcmagic, 'lcmagic', 'lcmagic(line, cell=None)', 
                   "A line/cell magic")
         
diff --git a/IPython/core/tests/test_prefilter.py b/IPython/core/tests/test_prefilter.py
@@ -6,7 +6,7 @@
 import nose.tools as nt
 
 from IPython.core.prefilter import AutocallChecker
-from IPython.testing import tools as tt, decorators as dec
+from IPython.testing import decorators as dec
 from IPython.testing.globalipapp import get_ipython
 
 #-----------------------------------------------------------------------------
diff --git a/IPython/core/tests/test_profile.py b/IPython/core/tests/test_profile.py
@@ -29,7 +29,6 @@
 from unittest import TestCase
 
 import nose.tools as nt
-from nose import SkipTest
 
 from IPython.core.profileapp import list_profiles_in, list_bundled_profiles
 from IPython.core.profiledir import ProfileDir
diff --git a/IPython/core/tests/test_prompts.py b/IPython/core/tests/test_prompts.py
@@ -4,12 +4,10 @@
 import unittest
 
 import os
-import nose.tools as nt
 
 from IPython.testing import tools as tt, decorators as dec
 from IPython.core.prompts import PromptManager, LazyEvaluate
 from IPython.testing.globalipapp import get_ipython
-from IPython.utils import py3compat
 from IPython.utils.tempdir import TemporaryDirectory
 
 ip = get_ipython()
diff --git a/IPython/core/tests/test_shellapp.py b/IPython/core/tests/test_shellapp.py
@@ -17,8 +17,6 @@
 #-----------------------------------------------------------------------------
 import unittest
 
-import nose.tools as nt
-
 from IPython.testing import decorators as dec
 from IPython.testing import tools as tt
 
diff --git a/IPython/core/tests/test_splitinput.py b/IPython/core/tests/test_splitinput.py
@@ -1,5 +1,7 @@
 # coding: utf-8
-from IPython.core.splitinput import split_user_input
+import nose.tools as nt
+
+from IPython.core.splitinput import split_user_input, LineInfo
 from IPython.testing import tools as tt
 from IPython.utils import py3compat
 
@@ -33,3 +35,8 @@
 
 def test_split_user_input():
     return tt.check_pairs(split_user_input, tests)
+
+def test_LineInfo():
+    """Simple test for LineInfo construction and str()"""
+    linfo = LineInfo('  %cd /home')
+    nt.assert_equal(str(linfo), 'LineInfo [  |%|cd|/home]')
