From 16e26cabda2e5f616b31a6c36b5d386d10bc648e 2013-01-31 14:46:52 From: Thomas Kluyver Date: 2013-01-31 14:46:52 Subject: [PATCH] Remove unused imports --- diff --git a/IPython/core/alias.py b/IPython/core/alias.py index 1598fc1..a9bb0d6 100644 --- a/IPython/core/alias.py +++ b/IPython/core/alias.py @@ -30,7 +30,6 @@ from IPython.config.configurable import Configurable from IPython.core.splitinput import split_user_input from IPython.utils.traitlets import List, Instance -from IPython.utils.autoattr import auto_attr from IPython.utils.warn import warn, error #----------------------------------------------------------------------------- diff --git a/IPython/core/completer.py b/IPython/core/completer.py index 45c8413..f75219c 100644 --- a/IPython/core/completer.py +++ b/IPython/core/completer.py @@ -74,7 +74,6 @@ import itertools import keyword import os import re -import shlex import sys from IPython.config.configurable import Configurable diff --git a/IPython/core/completerlib.py b/IPython/core/completerlib.py index 3e52e70..7abe539 100644 --- a/IPython/core/completerlib.py +++ b/IPython/core/completerlib.py @@ -30,7 +30,6 @@ from zipimport import zipimporter # Our own imports from IPython.core.completer import expand_user, compress_user from IPython.core.error import TryNext -from IPython.utils import py3compat from IPython.utils._process_common import arg_split # FIXME: this should be pulled in with the right call via the component system diff --git a/IPython/core/debugger.py b/IPython/core/debugger.py index d918945..ec65708 100644 --- a/IPython/core/debugger.py +++ b/IPython/core/debugger.py @@ -33,7 +33,7 @@ import sys from IPython.utils import PyColorize, ulinecache from IPython.core import ipapi -from IPython.utils import coloransi, io, openpy, py3compat +from IPython.utils import coloransi, io, py3compat from IPython.core.excolors import exception_colors # See if we can use pydb. diff --git a/IPython/core/displayhook.py b/IPython/core/displayhook.py index 4949893..6cd5568 100644 --- a/IPython/core/displayhook.py +++ b/IPython/core/displayhook.py @@ -30,7 +30,7 @@ import sys from IPython.config.configurable import Configurable from IPython.utils import io -from IPython.utils.traitlets import Instance, List +from IPython.utils.traitlets import Instance from IPython.utils.warn import warn #----------------------------------------------------------------------------- diff --git a/IPython/core/macro.py b/IPython/core/macro.py index 619fb47..ca46266 100644 --- a/IPython/core/macro.py +++ b/IPython/core/macro.py @@ -8,7 +8,6 @@ #***************************************************************************** import re -import sys from IPython.utils import py3compat from IPython.utils.encoding import DEFAULT_ENCODING diff --git a/IPython/core/magic.py b/IPython/core/magic.py index 0b1dfe0..904ffe9 100644 --- a/IPython/core/magic.py +++ b/IPython/core/magic.py @@ -31,7 +31,7 @@ from IPython.utils.ipstruct import Struct from IPython.utils.process import arg_split from IPython.utils.text import dedent from IPython.utils.traitlets import Bool, Dict, Instance, MetaHasTraits -from IPython.utils.warn import error, warn +from IPython.utils.warn import error #----------------------------------------------------------------------------- # Globals diff --git a/IPython/core/magics/code.py b/IPython/core/magics/code.py index 1d9defd..5826539 100644 --- a/IPython/core/magics/code.py +++ b/IPython/core/magics/code.py @@ -25,7 +25,6 @@ from IPython.core.macro import Macro from IPython.core.magic import Magics, magics_class, line_magic from IPython.core.oinspect import find_file, find_source_lines from IPython.testing.skipdoctest import skip_doctest -from IPython.utils import openpy from IPython.utils import py3compat from IPython.utils.contexts import preserve_keys from IPython.utils.io import file_read diff --git a/IPython/core/magics/display.py b/IPython/core/magics/display.py index 4e6e234..5a075fb 100644 --- a/IPython/core/magics/display.py +++ b/IPython/core/magics/display.py @@ -14,7 +14,7 @@ # Our own packages from IPython.core.display import display, Javascript, Latex, SVG from IPython.core.magic import ( - Magics, magics_class, line_magic, cell_magic + Magics, magics_class, cell_magic ) #----------------------------------------------------------------------------- diff --git a/IPython/core/magics/history.py b/IPython/core/magics/history.py index 869d77b..6dcc768 100644 --- a/IPython/core/magics/history.py +++ b/IPython/core/magics/history.py @@ -16,7 +16,6 @@ from __future__ import print_function # Stdlib import os from io import open as io_open -from IPython.external.argparse import Action # Our own packages from IPython.core.error import StdinNotImplementedError diff --git a/IPython/core/magics/osm.py b/IPython/core/magics/osm.py index 9bcd1bf..3809cf0 100644 --- a/IPython/core/magics/osm.py +++ b/IPython/core/magics/osm.py @@ -26,14 +26,14 @@ from pprint import pformat from IPython.core import magic_arguments from IPython.core import oinspect from IPython.core import page -from IPython.core.error import UsageError, StdinNotImplementedError +from IPython.core.error import UsageError from IPython.core.magic import ( Magics, compress_dhist, magics_class, line_magic, cell_magic, line_cell_magic ) from IPython.testing.skipdoctest import skip_doctest -from IPython.utils.io import file_read, nlprint +from IPython.utils.io import nlprint from IPython.utils.openpy import source_to_unicode -from IPython.utils.path import get_py_filename, unquote_filename +from IPython.utils.path import unquote_filename from IPython.utils.process import abbrev_cwd from IPython.utils.terminal import set_term_title #----------------------------------------------------------------------------- diff --git a/IPython/core/magics/script.py b/IPython/core/magics/script.py index 6dc53e1..ef595e1 100644 --- a/IPython/core/magics/script.py +++ b/IPython/core/magics/script.py @@ -14,7 +14,6 @@ # Stdlib import errno import os -import re import sys import signal import time @@ -24,12 +23,10 @@ import atexit # Our own packages from IPython.config.configurable import Configurable from IPython.core import magic_arguments -from IPython.core.error import UsageError from IPython.core.magic import ( Magics, magics_class, line_magic, cell_magic ) from IPython.lib.backgroundjobs import BackgroundJobManager -from IPython.testing.skipdoctest import skip_doctest from IPython.utils import py3compat from IPython.utils.process import arg_split from IPython.utils.traitlets import List, Dict diff --git a/IPython/core/page.py b/IPython/core/page.py index 9a35162..ca5332a 100644 --- a/IPython/core/page.py +++ b/IPython/core/page.py @@ -29,7 +29,6 @@ from __future__ import print_function import os import re -import subprocess import sys import tempfile diff --git a/IPython/core/prefilter.py b/IPython/core/prefilter.py index 2a46a23..8257150 100644 --- a/IPython/core/prefilter.py +++ b/IPython/core/prefilter.py @@ -24,11 +24,8 @@ Authors: # Imports #----------------------------------------------------------------------------- -import __builtin__ -import codeop import re -from IPython.core.alias import AliasManager from IPython.core.autocall import IPyAutocall from IPython.config.configurable import Configurable from IPython.core.inputsplitter import ( @@ -42,13 +39,11 @@ from IPython.core.inputsplitter import ( ESC_PAREN, ) from IPython.core.macro import Macro -from IPython.core.splitinput import split_user_input, LineInfo -from IPython.core import page +from IPython.core.splitinput import LineInfo from IPython.utils.traitlets import ( - List, Integer, Any, Unicode, CBool, Bool, Instance, CRegExp + List, Integer, Unicode, CBool, Bool, Instance, CRegExp ) -from IPython.utils.autoattr import auto_attr #----------------------------------------------------------------------------- # Global utilities, errors and constants diff --git a/IPython/core/profileapp.py b/IPython/core/profileapp.py index f83fd13..39479cd 100644 --- a/IPython/core/profileapp.py +++ b/IPython/core/profileapp.py @@ -21,12 +21,11 @@ Authors: # Imports #----------------------------------------------------------------------------- -import logging import os -from IPython.config.application import Application, boolean_flag +from IPython.config.application import Application from IPython.core.application import ( - BaseIPythonApplication, base_flags, base_aliases + BaseIPythonApplication, base_flags ) from IPython.core.profiledir import ProfileDir from IPython.utils.path import get_ipython_dir, get_ipython_package_dir diff --git a/IPython/core/profiledir.py b/IPython/core/profiledir.py index 03ffaca..ba6861f 100644 --- a/IPython/core/profiledir.py +++ b/IPython/core/profiledir.py @@ -23,12 +23,10 @@ Authors: import os import shutil -import sys from IPython.config.configurable import LoggingConfigurable -from IPython.config.loader import Config from IPython.utils.path import get_ipython_package_dir, expand_path -from IPython.utils.traitlets import List, Unicode, Bool +from IPython.utils.traitlets import Unicode, Bool #----------------------------------------------------------------------------- # Classes and functions diff --git a/IPython/core/ultratb.py b/IPython/core/ultratb.py index 6a74a40..6413215 100644 --- a/IPython/core/ultratb.py +++ b/IPython/core/ultratb.py @@ -109,7 +109,6 @@ from IPython.utils import py3compat from IPython.utils import pyfile from IPython.utils import ulinecache from IPython.utils.data import uniq_stable -from IPython.utils.openpy import read_py_file from IPython.utils.warn import info, error # Globals diff --git a/IPython/lib/backgroundjobs.py b/IPython/lib/backgroundjobs.py index e14feed..3bf3460 100644 --- a/IPython/lib/backgroundjobs.py +++ b/IPython/lib/backgroundjobs.py @@ -34,7 +34,7 @@ import sys import threading from IPython.core.ultratb import AutoFormattedTB -from IPython.utils.warn import warn, error +from IPython.utils.warn import error class BackgroundJobManager(object): diff --git a/IPython/lib/clipboard.py b/IPython/lib/clipboard.py index b5f241f..cb3dffd 100644 --- a/IPython/lib/clipboard.py +++ b/IPython/lib/clipboard.py @@ -2,7 +2,6 @@ """ import subprocess -import sys from IPython.core.error import TryNext import IPython.utils.py3compat as py3compat diff --git a/IPython/lib/demo.py b/IPython/lib/demo.py index 20db56b..a094c10 100644 --- a/IPython/lib/demo.py +++ b/IPython/lib/demo.py @@ -183,9 +183,8 @@ import re import shlex import sys -from IPython.utils.PyColorize import Parser from IPython.utils import io -from IPython.utils.io import file_read, file_readlines +from IPython.utils.io import file_read from IPython.utils.text import marquee from IPython.utils import openpy __all__ = ['Demo','IPythonDemo','LineDemo','IPythonLineDemo','DemoError'] diff --git a/IPython/lib/inputhookwx.py b/IPython/lib/inputhookwx.py index 1eff4ce..eaf87bd 100644 --- a/IPython/lib/inputhookwx.py +++ b/IPython/lib/inputhookwx.py @@ -17,9 +17,7 @@ Authors: Robin Dunn, Brian Granger, Ondrej Certik # Imports #----------------------------------------------------------------------------- -import os import signal -import sys import time from timeit import default_timer as clock import wx diff --git a/IPython/lib/latextools.py b/IPython/lib/latextools.py index d8860e3..58df20b 100644 --- a/IPython/lib/latextools.py +++ b/IPython/lib/latextools.py @@ -26,7 +26,7 @@ import subprocess from IPython.utils.process import find_cmd, FindCmdError from IPython.config.configurable import SingletonConfigurable -from IPython.utils.traitlets import Instance, List, CBool, CUnicode +from IPython.utils.traitlets import List, CBool, CUnicode from IPython.utils.py3compat import bytes_to_str #----------------------------------------------------------------------------- diff --git a/IPython/utils/_process_posix.py b/IPython/utils/_process_posix.py index 50f3026..dae2f42 100644 --- a/IPython/utils/_process_posix.py +++ b/IPython/utils/_process_posix.py @@ -24,7 +24,6 @@ from IPython.external import pexpect # Our own from .autoattr import auto_attr from ._process_common import getoutput, arg_split -from IPython.utils import text from IPython.utils import py3compat from IPython.utils.encoding import DEFAULT_ENCODING diff --git a/IPython/utils/_process_win32.py b/IPython/utils/_process_win32.py index cf53c57..0d899d4 100644 --- a/IPython/utils/_process_win32.py +++ b/IPython/utils/_process_win32.py @@ -28,7 +28,6 @@ from subprocess import STDOUT # our own imports from ._process_common import read_no_interrupt, process_handler, arg_split as py_arg_split from . import py3compat -from . import text from .encoding import DEFAULT_ENCODING #----------------------------------------------------------------------------- diff --git a/IPython/utils/jsonutil.py b/IPython/utils/jsonutil.py index 4f077ef..87d99bc 100644 --- a/IPython/utils/jsonutil.py +++ b/IPython/utils/jsonutil.py @@ -13,7 +13,6 @@ # stdlib import math import re -import sys import types from datetime import datetime @@ -26,7 +25,6 @@ except ImportError: from IPython.utils import py3compat from IPython.utils.encoding import DEFAULT_ENCODING -from IPython.utils import text next_attr_name = '__next__' if py3compat.PY3 else 'next' #----------------------------------------------------------------------------- diff --git a/IPython/utils/pickleutil.py b/IPython/utils/pickleutil.py index 428d451..d59680b 100644 --- a/IPython/utils/pickleutil.py +++ b/IPython/utils/pickleutil.py @@ -30,7 +30,6 @@ try: except: numpy = None -import codeutil import py3compat from importstring import import_item diff --git a/IPython/utils/process.py b/IPython/utils/process.py index a5ae2a7..9315fa9 100644 --- a/IPython/utils/process.py +++ b/IPython/utils/process.py @@ -28,7 +28,6 @@ else: from ._process_common import getoutputerror -from IPython.utils import py3compat #----------------------------------------------------------------------------- # Code diff --git a/IPython/utils/rlineimpl.py b/IPython/utils/rlineimpl.py index b4e894a..4b9f9ca 100644 --- a/IPython/utils/rlineimpl.py +++ b/IPython/utils/rlineimpl.py @@ -9,14 +9,9 @@ In addition to normal readline stuff, this module provides have_readline boolean and _outputfile variable used in IPython.utils. """ -import os -import re import sys -import time import warnings -from subprocess import Popen, PIPE - if sys.platform == 'darwin': # dirty trick, to skip the system readline, because pip-installed readline # will never be found on OSX, since lib-dynload always comes ahead of site-packages diff --git a/IPython/utils/sysinfo.py b/IPython/utils/sysinfo.py index d31c1c2..5b7f8e5 100644 --- a/IPython/utils/sysinfo.py +++ b/IPython/utils/sysinfo.py @@ -20,8 +20,6 @@ import pprint import sys import subprocess -from ConfigParser import ConfigParser - from IPython.core import release from IPython.utils import py3compat, _sysinfo, encoding