Merge pull request #12015 from Carreau/cleanup-imports

Cleanup imports, update some deprecation messages.

IPython/core/completer.py

@@ -126,7 +126,7 b' import warnings'
 
 from contextlib import contextmanager
 from importlib import import_module
-from typing import Iterator, List, Tuple, Iterable, Union
+from typing import Iterator, List, Tuple, Iterable
 from types import SimpleNamespace
 
 from traitlets.config.configurable import Configurable

IPython/core/displaypub.py

@@ -19,7 +19,7 b' spec.'
 import sys
 
 from traitlets.config.configurable import Configurable
-from traitlets import List, Dict
+from traitlets import List
 
 # This used to be defined here - it is imported for backwards compatibility
 from .display import publish_display_data

IPython/core/interactiveshell.py

@@ -13,7 +13,6 b''
 
 import abc
 import ast
-import asyncio
 import atexit
 import builtins as builtin_mod
 import functools
@@ -87,6 +86,7 b' from ast import AST'
 
 # NoOpContext is deprecated, but ipykernel imports it from here.
 # See https://github.com/ipython/ipykernel/issues/157
+# (2016, let's try to remove than in IPython 8.0)
 from IPython.utils.contexts import NoOpContext
 
 try:

IPython/core/magics/basic.py

@@ -5,7 +5,6 b' import argparse'
 from logging import error
 import io
 from pprint import pformat
-import textwrap
 import sys
 from warnings import warn
 

IPython/core/magics/packaging.py

@@ -12,7 +12,6 b' import os'
 import re
 import shlex
 import sys
-from subprocess import Popen, PIPE
 
 from IPython.core.magic import Magics, magics_class, line_magic
 
@@ -101,4 +100,4 b' class PackagingMagics(Magics):'
             extra_args.extend(["--prefix", sys.prefix])
 
         self.shell.system(' '.join([conda, command] + extra_args + args))
-        print("\nNote: you may need to restart the kernel to use updated packages.")
  No newline at end of file
+        print("\nNote: you may need to restart the kernel to use updated packages.")

IPython/core/tests/refbug.py

@@ -16,7 +16,6 b' test_run.py calls it.'
 #-----------------------------------------------------------------------------
 # Module imports
 #-----------------------------------------------------------------------------
-import sys
 
 from IPython import get_ipython
 

IPython/core/tests/test_async_helpers.py

@@ -3,7 +3,6 b' Test for async helpers.'
 
 Should only trigger on python 3.5+ or will have syntax errors.
 """
-import sys
 from itertools import chain, repeat
 import nose.tools as nt
 from textwrap import dedent, indent

IPython/core/tests/test_display.py

@@ -14,7 +14,7 b' from IPython.core.getipython import get_ipython'
 from IPython.utils.io import capture_output
 from IPython.utils.tempdir import NamedFileInTemporaryDirectory
 from IPython import paths as ipath
-from IPython.testing.tools import AssertPrints, AssertNotPrints
+from IPython.testing.tools import AssertNotPrints
 
 import IPython.testing.decorators as dec
 

IPython/core/tests/test_events.py

@@ -1,4 +1,3 b''
-from backcall import callback_prototype
 import unittest
 from unittest.mock import Mock
 import nose.tools as nt

IPython/core/tests/test_handlers.py

@@ -10,7 +10,6 b' import nose.tools as nt'
 # our own packages
 from IPython.core import autocall
 from IPython.testing import tools as tt
-from IPython.utils import py3compat
 
 #-----------------------------------------------------------------------------
 # Globals

IPython/extensions/tests/test_autoreload.py

@@ -26,8 +26,6 b' import IPython.testing.tools as tt'
 
 from unittest import TestCase
 
-from IPython.testing.decorators import skipif
-
 from IPython.extensions.autoreload import AutoreloadMagics
 from IPython.core.events import EventManager, pre_run_cell
 
@@ -141,7 +139,6 b' def pickle_get_current_class(obj):'
 class TestAutoreload(Fixture):
 
     def test_reload_enums(self):
-        import enum
         mod_name, mod_fn = self.new_module(textwrap.dedent("""
                                 from enum import Enum
                                 class MyEnum(Enum):

IPython/utils/daemonize.py

@@ -1,4 +1,4 b''
 from warnings import warn
 
-warn("IPython.utils.daemonize has moved to ipyparallel.apps.daemonize", stacklevel=2)
+warn("IPython.utils.daemonize has moved to ipyparallel.apps.daemonize since IPython 4.0", DeprecationWarning, stacklevel=2)
 from ipyparallel.apps.daemonize import daemonize

IPython/utils/frame.py

@@ -15,7 +15,6 b' Utilities for working with stack frames.'
 #-----------------------------------------------------------------------------
 
 import sys
-from IPython.utils import py3compat
 
 #-----------------------------------------------------------------------------
 # Code

IPython/utils/tests/test_io.py

@@ -5,9 +5,6 b''
 # Distributed under the terms of the Modified BSD License.
 
 
-import io as stdlib_io
-import os.path
-import stat
 import sys
 from io import StringIO
 
@@ -16,9 +13,7 b' import unittest'
 
 import nose.tools as nt
 
-from IPython.testing.decorators import skipif, skip_win32
 from IPython.utils.io import IOStream, Tee, capture_output
-from IPython.utils.tempdir import TemporaryDirectory
 
 
 def test_tee_simple():

IPython/utils/tests/test_path.py

@@ -21,9 +21,9 b' import IPython'
 from IPython import paths
 from IPython.testing import decorators as dec
 from IPython.testing.decorators import (skip_if_not_win32, skip_win32,
-                                        onlyif_unicode_paths, skipif,
+                                        onlyif_unicode_paths,
                                         skip_win32_py38,)
-from IPython.testing.tools import make_tempfile, AssertPrints
+from IPython.testing.tools import make_tempfile
 from IPython.utils import path
 from IPython.utils.tempdir import TemporaryDirectory
 

IPython/utils/tests/test_process.py

@@ -16,7 +16,6 b' Tests for platutils.py'
 
 import sys
 import os
-from unittest import TestCase
 
 import nose.tools as nt