diff --git a/IPython/utils/_process_win32.py b/IPython/utils/_process_win32.py index 0d899d4..8e11222 100644 --- a/IPython/utils/_process_win32.py +++ b/IPython/utils/_process_win32.py @@ -19,7 +19,6 @@ from __future__ import print_function import os import sys import ctypes -import msvcrt from ctypes import c_int, POINTER from ctypes.wintypes import LPCWSTR, HLOCAL diff --git a/IPython/utils/_process_win32_controller.py b/IPython/utils/_process_win32_controller.py index f4e7c15..8bd01b3 100644 --- a/IPython/utils/_process_win32_controller.py +++ b/IPython/utils/_process_win32_controller.py @@ -13,7 +13,7 @@ This file is meant to be used by process.py from __future__ import print_function # stdlib -import os, sys, time, threading +import os, sys, threading import ctypes, msvcrt # Win32 API types needed for the API calls diff --git a/IPython/utils/pickleutil.py b/IPython/utils/pickleutil.py index 2cf614c..63e4b2c 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/tests/test_module_paths.py b/IPython/utils/tests/test_module_paths.py index f422bbc..06ef575 100644 --- a/IPython/utils/tests/test_module_paths.py +++ b/IPython/utils/tests/test_module_paths.py @@ -1,5 +1,5 @@ # encoding: utf-8 -"""Tests for IPython.utils.path.py""" +"""Tests for IPython.utils.module_paths.py""" #----------------------------------------------------------------------------- # Copyright (C) 2008-2011 The IPython Development Team @@ -18,20 +18,10 @@ import os import shutil import sys import tempfile -import StringIO from os.path import join, abspath, split -import nose.tools as nt - -from nose import with_setup - -import IPython -from IPython.testing import decorators as dec -from IPython.testing.decorators import skip_if_not_win32, skip_win32 from IPython.testing.tools import make_tempfile -from IPython.utils import path, io -from IPython.utils import py3compat import IPython.utils.module_paths as mp @@ -91,7 +81,7 @@ def test_get_init_3(): with make_tempfile(join(TMP_TEST_DIR, "__init__.pyc")): assert mp.get_init(TMP_TEST_DIR) is None -def test_get_init_3(): +def test_get_init_4(): """get_init can't find __init__ in empty testdir""" assert mp.get_init(TMP_TEST_DIR) is None diff --git a/IPython/utils/tests/test_path.py b/IPython/utils/tests/test_path.py index c5b0376..0e0e351 100644 --- a/IPython/utils/tests/test_path.py +++ b/IPython/utils/tests/test_path.py @@ -18,7 +18,6 @@ import os import shutil import sys import tempfile -from io import StringIO from contextlib import contextmanager from os.path import join, abspath, split @@ -31,7 +30,7 @@ import IPython from IPython.testing import decorators as dec from IPython.testing.decorators import skip_if_not_win32, skip_win32 from IPython.testing.tools import make_tempfile, AssertPrints -from IPython.utils import path, io +from IPython.utils import path from IPython.utils import py3compat from IPython.utils.tempdir import TemporaryDirectory diff --git a/IPython/utils/tests/test_text.py b/IPython/utils/tests/test_text.py index a00c4a5..5803a85 100644 --- a/IPython/utils/tests/test_text.py +++ b/IPython/utils/tests/test_text.py @@ -18,9 +18,6 @@ import random import nose.tools as nt -from nose import with_setup - -from IPython.testing import decorators as dec from IPython.utils import text #----------------------------------------------------------------------------- diff --git a/IPython/utils/tests/test_wildcard.py b/IPython/utils/tests/test_wildcard.py index 7c5cff5..7e407d2 100644 --- a/IPython/utils/tests/test_wildcard.py +++ b/IPython/utils/tests/test_wildcard.py @@ -4,7 +4,6 @@ # Library imports #----------------------------------------------------------------------------- # Stdlib -import sys import unittest # Our own diff --git a/IPython/utils/text.py b/IPython/utils/text.py index 44b19b9..55b8861 100644 --- a/IPython/utils/text.py +++ b/IPython/utils/text.py @@ -19,18 +19,14 @@ Inheritance diagram: # Imports #----------------------------------------------------------------------------- -import __main__ - import os import re -import sys import textwrap from string import Formatter from IPython.external.path import path from IPython.testing.skipdoctest import skip_doctest_py3, skip_doctest from IPython.utils import py3compat -from IPython.utils.data import flatten #----------------------------------------------------------------------------- # Code diff --git a/IPython/utils/zmqrelated.py b/IPython/utils/zmqrelated.py index 8abbabb..e06e3f0 100644 --- a/IPython/utils/zmqrelated.py +++ b/IPython/utils/zmqrelated.py @@ -10,7 +10,6 @@ # Verify zmq version dependency >= 2.1.11 #----------------------------------------------------------------------------- -import warnings from IPython.utils.version import check_version