update dependency imports

Stop using shimmed, deprecated paths.

This should eliminate the shim warnings in IPython itself.

IPython/__init__.py

@@ -42,7 +42,6 sys.path.append(os.path.join(os.path.dirname(__file__), "extensions"))
 # Setup the top level names
 #-----------------------------------------------------------------------------
 
-from .config.loader import Config
 from .core.getipython import get_ipython
 from .core import release
 from .core.application import Application
@@ -88,7 +87,7 def embed_kernel(module=None, local_ns=None, **kwargs):
         local_ns = caller_locals
     
     # Only import .zmq when we really need it
-    from IPython.kernel.zmq.embed import embed_kernel as real_embed_kernel
+    from ipython_kernel.embed import embed_kernel as real_embed_kernel
     real_embed_kernel(module=module, local_ns=local_ns, **kwargs)
 
 def start_ipython(argv=None, **kwargs):

IPython/core/alias.py

@@ -24,11 +24,11 import os
 import re
 import sys
 
-from IPython.config.configurable import Configurable
+from traitlets.config.configurable import Configurable
 from IPython.core.error import UsageError
 
 from IPython.utils.py3compat import string_types
-from IPython.utils.traitlets import List, Instance
+from traitlets import List, Instance
 from IPython.utils.warn import error
 
 #-----------------------------------------------------------------------------

IPython/core/application.py

@@ -19,13 +19,14 import os
 import shutil
 import sys
 
-from IPython.config.application import Application, catch_config_error
-from IPython.config.loader import ConfigFileNotFound, PyFileConfigLoader
+from traitlets.config.application import Application, catch_config_error
+from traitlets.config.loader import ConfigFileNotFound, PyFileConfigLoader
 from IPython.core import release, crashhandler
 from IPython.core.profiledir import ProfileDir, ProfileDirError
-from IPython.utils.path import get_ipython_dir, get_ipython_package_dir, ensure_dir_exists
+from IPython.paths import get_ipython_dir, get_ipython_package_dir
+from IPython.utils.path import ensure_dir_exists
 from IPython.utils import py3compat
-from IPython.utils.traitlets import List, Unicode, Type, Bool, Dict, Set, Instance, Undefined
+from traitlets import List, Unicode, Type, Bool, Dict, Set, Instance, Undefined
 
 if os.name == 'nt':
     programdata = os.environ.get('PROGRAMDATA', None)

IPython/core/builtin_trap.py

@@ -18,10 +18,10 Authors:
 # Imports
 #-----------------------------------------------------------------------------
 
-from IPython.config.configurable import Configurable
+from traitlets.config.configurable import Configurable
 
 from IPython.utils.py3compat import builtin_mod, iteritems
-from IPython.utils.traitlets import Instance
+from traitlets import Instance
 
 #-----------------------------------------------------------------------------
 # Classes and functions

IPython/core/completer.py

@@ -64,7 +64,7 import sys
 import unicodedata
 import string
 
-from IPython.config.configurable import Configurable 
+from traitlets.config.configurable import Configurable 
 from IPython.core.error import TryNext
 from IPython.core.inputsplitter import ESC_MAGIC
 from IPython.core.latex_symbols import latex_symbols, reverse_latex_symbol
@@ -74,7 +74,7 from IPython.utils.decorators import undoc
 from IPython.utils.dir2 import dir2
 from IPython.utils.process import arg_split
 from IPython.utils.py3compat import builtin_mod, string_types, PY3
-from IPython.utils.traitlets import CBool, Enum
+from traitlets import CBool, Enum
 
 #-----------------------------------------------------------------------------
 # Globals

IPython/core/display.py

@@ -930,9 +930,9 def set_matplotlib_formats(*formats, **kwargs):
     """
     from IPython.core.interactiveshell import InteractiveShell
     from IPython.core.pylabtools import select_figure_formats
-    from IPython.kernel.zmq.pylab.config import InlineBackend
     # build kwargs, starting with InlineBackend config
     kw = {}
+    from ipython_kernel.pylab.config import InlineBackend
     cfg = InlineBackend.instance()
     kw.update(cfg.print_figure_kwargs)
     kw.update(**kwargs)
@@ -961,7 +961,7 def set_matplotlib_close(close=True):
         Should all matplotlib figures be automatically closed after each cell is
         run?
     """
-    from IPython.kernel.zmq.pylab.config import InlineBackend
+    from ipython_kernel.pylab.config import InlineBackend
     cfg = InlineBackend.instance()
     cfg.close_figures = close
 

IPython/core/display_trap.py

@@ -21,8 +21,8 Authors:
 
 import sys
 
-from IPython.config.configurable import Configurable
-from IPython.utils.traitlets import Any
+from traitlets.config.configurable import Configurable
+from traitlets import Any
 
 #-----------------------------------------------------------------------------
 # Classes and functions

IPython/core/displayhook.py

@@ -12,10 +12,10 from __future__ import print_function
 import sys
 
 from IPython.core.formatters import _safe_get_formatter_method
-from IPython.config.configurable import Configurable
+from traitlets.config.configurable import Configurable
 from IPython.utils import io
 from IPython.utils.py3compat import builtin_mod
-from IPython.utils.traitlets import Instance, Float
+from traitlets import Instance, Float
 from IPython.utils.warn import warn
 
 # TODO: Move the various attributes (cache_size, [others now moved]). Some

IPython/core/displaypub.py

@@ -17,9 +17,9 spec.
 
 from __future__ import print_function
 
-from IPython.config.configurable import Configurable
+from traitlets.config.configurable import Configurable
 from IPython.utils import io
-from IPython.utils.traitlets import List
+from traitlets import List
 
 # This used to be defined here - it is imported for backwards compatibility
 from .display import publish_display_data

IPython/core/extensions.py

@@ -8,9 +8,9 import os
 from shutil import copyfile
 import sys
 
-from IPython.config.configurable import Configurable
+from traitlets.config.configurable import Configurable
 from IPython.utils.path import ensure_dir_exists
-from IPython.utils.traitlets import Instance
+from traitlets import Instance
 from IPython.utils.py3compat import PY3
 if PY3:
     from imp import reload

IPython/core/formatters.py

@@ -19,11 +19,11 import warnings
 
 from decorator import decorator
 
-from IPython.config.configurable import Configurable
+from traitlets.config.configurable import Configurable
 from IPython.core.getipython import get_ipython
 from IPython.utils.sentinel import Sentinel
 from IPython.lib import pretty
-from IPython.utils.traitlets import (
+from traitlets import (
     Bool, Dict, Integer, Unicode, CUnicode, ObjectName, List,
     ForwardDeclaredInstance,
 )

IPython/core/history.py

@@ -27,12 +27,12 except ImportError:
 import threading
 
 # Our own packages
-from IPython.config.configurable import Configurable
+from traitlets.config.configurable import Configurable
 from decorator import decorator
 from IPython.utils.decorators import undoc
 from IPython.utils.path import locate_profile
 from IPython.utils import py3compat
-from IPython.utils.traitlets import (
+from traitlets import (
     Any, Bool, Dict, Instance, Integer, List, Unicode, TraitError,
 )
 from IPython.utils.warn import warn
@@ -177,7 +177,7 class HistoryAccessor(HistoryAccessorBase):
         hist_file : str
           Path to an SQLite history database stored by IPython. If specified,
           hist_file overrides profile.
-        config : :class:`~IPython.config.loader.Config`
+        config : :class:`~traitlets.config.loader.Config`
           Config object. hist_file can also be set through this.
         """
         # We need a pointer back to the shell for various tasks.

IPython/core/historyapp.py

@@ -9,9 +9,9 from __future__ import print_function
 import os
 import sqlite3
 
-from IPython.config.application import Application
+from traitlets.config.application import Application
 from IPython.core.application import BaseIPythonApplication
-from IPython.utils.traitlets import Bool, Int, Dict
+from traitlets import Bool, Int, Dict
 from IPython.utils.io import ask_yes_no
 
 trim_hist_help = """Trim the IPython history database to the last 1000 entries.

IPython/core/interactiveshell.py

@@ -29,7 +29,7 from io import open as io_open
 
 from pickleshare import PickleShareDB
 
-from IPython.config.configurable import SingletonConfigurable
+from traitlets.config.configurable import SingletonConfigurable
 from IPython.core import debugger, oinspect
 from IPython.core import magic
 from IPython.core import page
@@ -64,7 +64,8 from IPython.utils import openpy
 from IPython.utils.decorators import undoc
 from IPython.utils.io import ask_yes_no
 from IPython.utils.ipstruct import Struct
-from IPython.utils.path import get_home_dir, get_ipython_dir, get_py_filename, unquote_filename, ensure_dir_exists
+from IPython.paths import get_ipython_dir
+from IPython.utils.path import get_home_dir, get_py_filename, unquote_filename, ensure_dir_exists
 from IPython.utils.process import system, getoutput
 from IPython.utils.py3compat import (builtin_mod, unicode_type, string_types,
                                      with_metaclass, iteritems)
@@ -72,7 +73,7 from IPython.utils.strdispatch import StrDispatch
 from IPython.utils.syspathcontext import prepended_to_syspath
 from IPython.utils.text import (format_screen, LSString, SList,
                                 DollarFormatter)
-from IPython.utils.traitlets import (Integer, Bool, CBool, CaselessStrEnum, Enum,
+from traitlets import (Integer, Bool, CBool, CaselessStrEnum, Enum,
                                      List, Dict, Unicode, Instance, Type)
 from IPython.utils.warn import warn, error
 import IPython.core.hooks
@@ -2688,7 +2689,7 class InteractiveShell(SingletonConfigurable):
         def get_cells():
             """generator for sequence of code blocks to run"""
             if fname.endswith('.ipynb'):
-                from IPython.nbformat import read
+                from jupyter_nbformat import read
                 with io_open(fname) as f:
                     nb = read(f, as_version=4)
                     if not nb.cells:

IPython/core/magic.py

@@ -23,7 +23,7 import types
 from getopt import getopt, GetoptError
 
 # Our own
-from IPython.config.configurable import Configurable
+from traitlets.config.configurable import Configurable
 from IPython.core import oinspect
 from IPython.core.error import UsageError
 from IPython.core.inputsplitter import ESC_MAGIC, ESC_MAGIC2
@@ -32,7 +32,7 from IPython.utils.ipstruct import Struct
 from IPython.utils.process import arg_split
 from IPython.utils.py3compat import string_types, iteritems
 from IPython.utils.text import dedent
-from IPython.utils.traitlets import Bool, Dict, Instance, MetaHasTraits
+from traitlets import Bool, Dict, Instance, MetaHasTraits
 from IPython.utils.warn import error
 
 #-----------------------------------------------------------------------------

IPython/core/magics/basic.py

@@ -596,7 +596,7 Defaulting color scheme to 'NoColor'"""
         """
         args = magic_arguments.parse_argstring(self.notebook, s)
 
-        from IPython.nbformat import write, v4
+        from jupyter_nbformat import write, v4
         args.filename = unquote_filename(args.filename)
         if args.export:
             cells = []

IPython/core/magics/config.py

@@ -106,7 +106,7 class ConfigMagics(Magics):
             In [5]: %config IPCompleter.greedy = feeling_greedy
 
         """
-        from IPython.config.loader import Config
+        from traitlets.config.loader import Config
         # some IPython objects are Configurable, but do not yet have
         # any configurable traits.  Exclude them from the effects of
         # this magic, as their presence is just noise:

IPython/core/magics/pylab.py

@@ -14,7 +14,7 from __future__ import print_function
 #-----------------------------------------------------------------------------
 
 # Our own packages
-from IPython.config.application import Application
+from traitlets.config.application import Application
 from IPython.core import magic_arguments
 from IPython.core.magic import Magics, magics_class, line_magic
 from IPython.testing.skipdoctest import skip_doctest

IPython/core/magics/script.py

@@ -22,7 +22,7 from subprocess import Popen, PIPE
 import atexit
 
 # Our own packages
-from IPython.config.configurable import Configurable
+from traitlets.config.configurable import Configurable
 from IPython.core import magic_arguments
 from IPython.core.magic import  (
     Magics, magics_class, line_magic, cell_magic
@@ -30,7 +30,7 from IPython.core.magic import (
 from IPython.lib.backgroundjobs import BackgroundJobManager
 from IPython.utils import py3compat
 from IPython.utils.process import arg_split
-from IPython.utils.traitlets import List, Dict
+from traitlets import List, Dict
 
 #-----------------------------------------------------------------------------
 # Magic implementation classes

IPython/core/payload.py

@@ -18,8 +18,8 Authors:
 # Imports
 #-----------------------------------------------------------------------------
 
-from IPython.config.configurable import Configurable
-from IPython.utils.traitlets import List
+from traitlets.config.configurable import Configurable
+from traitlets import List
 
 #-----------------------------------------------------------------------------
 # Main payload class

IPython/core/prefilter.py

@@ -28,7 +28,7 from keyword import iskeyword
 import re
 
 from IPython.core.autocall import IPyAutocall
-from IPython.config.configurable import Configurable
+from traitlets.config.configurable import Configurable
 from IPython.core.inputsplitter import (
     ESC_MAGIC,
     ESC_QUOTE,
@@ -38,7 +38,7 from IPython.core.inputsplitter import (
 from IPython.core.macro import Macro
 from IPython.core.splitinput import LineInfo
 
-from IPython.utils.traitlets import (
+from traitlets import (
     List, Integer, Unicode, CBool, Bool, Instance, CRegExp
 )
 

IPython/core/profileapp.py

@@ -24,15 +24,15 from __future__ import print_function
 
 import os
 
-from IPython.config.application import Application
+from traitlets.config.application import Application
 from IPython.core.application import (
     BaseIPythonApplication, base_flags
 )
 from IPython.core.profiledir import ProfileDir
 from IPython.utils.importstring import import_item
-from IPython.utils.path import get_ipython_dir, get_ipython_package_dir
+from IPython.paths import get_ipython_dir, get_ipython_package_dir
 from IPython.utils import py3compat
-from IPython.utils.traitlets import Unicode, Bool, Dict
+from traitlets import Unicode, Bool, Dict
 
 #-----------------------------------------------------------------------------
 # Constants
@@ -261,25 +261,19 class ProfileCreate(BaseIPythonApplication):
         from IPython.terminal.ipapp import TerminalIPythonApp
         apps = [TerminalIPythonApp]
         for app_path in (
-            'IPython.kernel.zmq.kernelapp.IPKernelApp',
-            'IPython.terminal.console.app.ZMQTerminalIPythonApp',
-            'IPython.qt.console.qtconsoleapp.IPythonQtConsoleApp',
-            'IPython.html.notebookapp.NotebookApp',
-            'IPython.nbconvert.nbconvertapp.NbConvertApp',
+            'ipython_kernel.kernelapp.IPKernelApp',
         ):
             app = self._import_app(app_path)
             if app is not None:
                 apps.append(app)
         if self.parallel:
-            from IPython.parallel.apps.ipcontrollerapp import IPControllerApp
-            from IPython.parallel.apps.ipengineapp import IPEngineApp
-            from IPython.parallel.apps.ipclusterapp import IPClusterStart
-            from IPython.parallel.apps.iploggerapp import IPLoggerApp
+            from ipython_parallel.apps.ipcontrollerapp import IPControllerApp
+            from ipython_parallel.apps.ipengineapp import IPEngineApp
+            from ipython_parallel.apps.ipclusterapp import IPClusterStart
             apps.extend([
                 IPControllerApp,
                 IPEngineApp,
                 IPClusterStart,
-                IPLoggerApp,
             ])
         for App in apps:
             app = App()

IPython/core/profiledir.py

@@ -8,10 +8,11 import os
 import shutil
 import errno
 
-from IPython.config.configurable import LoggingConfigurable
-from IPython.utils.path import get_ipython_package_dir, expand_path, ensure_dir_exists
+from traitlets.config.configurable import LoggingConfigurable
+from IPython.paths import get_ipython_package_dir
+from IPython.utils.path import expand_path, ensure_dir_exists
 from IPython.utils import py3compat
-from IPython.utils.traitlets import Unicode, Bool
+from traitlets import Unicode, Bool
 
 #-----------------------------------------------------------------------------
 # Module errors
@@ -137,34 +138,16 class ProfileDir(LoggingConfigurable):
     def _static_dir_changed(self, name, old, new):
         self.check_startup_dir()
 
-    def check_static_dir(self):
-        self._mkdir(self.static_dir)
-        custom = os.path.join(self.static_dir, 'custom')
-        self._mkdir(custom)
-        try:
-            from jupyter_notebook import DEFAULT_STATIC_FILES_PATH
-        except ImportError:
-            return
-        for fname in ('custom.js', 'custom.css'):
-            src = os.path.join(DEFAULT_STATIC_FILES_PATH, 'custom', fname)
-            dest = os.path.join(custom, fname)
-            if not os.path.exists(src):
-                self.log.warn("Could not copy default file to static dir. Source file %s does not exist.", src)
-                continue
-            if not os.path.exists(dest):
-                shutil.copy(src, dest)
-
     def check_dirs(self):
         self.check_security_dir()
         self.check_log_dir()
         self.check_pid_dir()
         self.check_startup_dir()
-        self.check_static_dir()
 
     def copy_config_file(self, config_file, path=None, overwrite=False):
         """Copy a default config file into the active profile directory.
 
-        Default configuration files are kept in :mod:`IPython.config.default`.
+        Default configuration files are kept in :mod:`IPython.core.profile`.
         This function moves these from that location to the working profile
         directory.
         """

IPython/core/prompts.py

@@ -28,10 +28,10 import time
 
 from string import Formatter
 
-from IPython.config.configurable import Configurable
+from traitlets.config.configurable import Configurable
 from IPython.core import release
 from IPython.utils import coloransi, py3compat
-from IPython.utils.traitlets import (Unicode, Instance, Dict, Bool, Int)
+from traitlets import (Unicode, Instance, Dict, Bool, Int)
 
 #-----------------------------------------------------------------------------
 # Color schemes for prompts

IPython/core/pylabtools.py

@@ -23,7 +23,7 backends = {'tk': 'TkAgg',
             'osx': 'MacOSX',
             'nbagg': 'nbAgg',
             'notebook': 'nbAgg',
-            'inline' : 'module://IPython.kernel.zmq.pylab.backend_inline'}
+            'inline' : 'module://ipython_kernel.pylab.backend_inline'}
 
 # We also need a reverse backends2guis mapping that will properly choose which
 # GUI support to activate based on the desired matplotlib backend.  For the
@@ -182,7 +182,7 def select_figure_formats(shell, formats, **kwargs):
         Extra keyword arguments to be passed to fig.canvas.print_figure.
     """
     from matplotlib.figure import Figure
-    from IPython.kernel.zmq.pylab import backend_inline
+    from ipython_kernel.pylab import backend_inline
 
     svg_formatter = shell.display_formatter.formatters['image/svg+xml']
     png_formatter = shell.display_formatter.formatters['image/png']
@@ -233,7 +233,7 def find_gui_and_backend(gui=None, gui_select=None):
     Returns
     -------
     A tuple of (gui, backend) where backend is one of ('TkAgg','GTKAgg',
-    'WXAgg','Qt4Agg','module://IPython.kernel.zmq.pylab.backend_inline').
+    'WXAgg','Qt4Agg','module://ipython_kernel.pylab.backend_inline').
     """
 
     import matplotlib
@@ -334,7 +334,7 def configure_inline_support(shell, backend):
     # continuing (such as in terminal-only shells in environments without
     # zeromq available).
     try:
-        from IPython.kernel.zmq.pylab.backend_inline import InlineBackend
+        from ipython_kernel.pylab.backend_inline import InlineBackend
     except ImportError:
         return
     from matplotlib import pyplot
@@ -345,7 +345,7 def configure_inline_support(shell, backend):
         shell.configurables.append(cfg)
 
     if backend == backends['inline']:
-        from IPython.kernel.zmq.pylab.backend_inline import flush_figures
+        from ipython_kernel.pylab.backend_inline import flush_figures
         shell.events.register('post_execute', flush_figures)
 
         # Save rcParams that will be overwrittern
@@ -355,7 +355,7 def configure_inline_support(shell, backend):
         # load inline_rc
         pyplot.rcParams.update(cfg.rc)
     else:
-        from IPython.kernel.zmq.pylab.backend_inline import flush_figures
+        from ipython_kernel.pylab.backend_inline import flush_figures
         try:
             shell.events.unregister('post_execute', flush_figures)
         except ValueError:

IPython/core/shellapp.py

@@ -14,14 +14,14 import glob
 import os
 import sys
 
-from IPython.config.application import boolean_flag
-from IPython.config.configurable import Configurable
-from IPython.config.loader import Config
+from traitlets.config.application import boolean_flag
+from traitlets.config.configurable import Configurable
+from traitlets.config.loader import Config
 from IPython.core import pylabtools
 from IPython.utils import py3compat
 from IPython.utils.contexts import preserve_keys
 from IPython.utils.path import filefind
-from IPython.utils.traitlets import (
+from traitlets import (
     Unicode, Instance, List, Bool, CaselessStrEnum
 )
 from IPython.lib.inputhook import guis

IPython/core/tests/test_completer.py

@@ -12,7 +12,7 from contextlib import contextmanager
 
 import nose.tools as nt
 
-from IPython.config.loader import Config
+from traitlets.config.loader import Config
 from IPython.core import completer
 from IPython.external.decorators import knownfailureif
 from IPython.utils.tempdir import TemporaryDirectory, TemporaryWorkingDirectory

IPython/core/tests/test_display.py

@@ -9,7 +9,7 import nose.tools as nt
 
 from IPython.core import display
 from IPython.core.getipython import get_ipython
-from IPython.utils import path as ipath
+from IPython import paths as ipath
 
 import IPython.testing.decorators as dec
 
@@ -60,7 +60,7 def test_image_filename_defaults():
     nt.assert_is_none(img._repr_jpeg_())
 
 def _get_inline_config():
-    from IPython.kernel.zmq.pylab.config import InlineBackend
+    from ipython_kernel.pylab.config import InlineBackend
     return InlineBackend.instance()
     
 @dec.skip_without('matplotlib')

IPython/core/tests/test_formatters.py

@@ -10,7 +10,7 except:
 import nose.tools as nt
 
 from IPython import get_ipython
-from IPython.config import Config
+from traitlets.config import Config
 from IPython.core.formatters import (
     PlainTextFormatter, HTMLFormatter, PDFFormatter, _mod_name_key,
     DisplayFormatter, JSONFormatter,

IPython/core/tests/test_history.py

@@ -16,7 +16,7 from datetime import datetime
 import nose.tools as nt
 
 # our own packages
-from IPython.config.loader import Config
+from traitlets.config.loader import Config
 from IPython.utils.tempdir import TemporaryDirectory
 from IPython.core.history import HistoryManager, extract_hist_ranges
 from IPython.utils import py3compat

IPython/core/tests/test_interactiveshell.py

@@ -607,8 +607,8 class TestModules(unittest.TestCase, tt.TempFileMixin):
         """
         self.mktmp("import sys\n"
                    "print('numpy' in sys.modules)\n"
-                   "print('IPython.parallel' in sys.modules)\n"
-                   "print('IPython.kernel.zmq' in sys.modules)\n"
+                   "print('ipython_parallel' in sys.modules)\n"
+                   "print('ipython_kernel' in sys.modules)\n"
                    )
         out = "False\nFalse\nFalse\n"
         tt.ipexec_validate(self.fname, out)

IPython/extensions/storemagic.py

@@ -28,7 +28,7 import inspect, os, sys, textwrap
 # Our own
 from IPython.core.error import UsageError
 from IPython.core.magic import Magics, magics_class, line_magic
-from IPython.utils.traitlets import Bool
+from traitlets import Bool
 from IPython.utils.py3compat import string_types
 
 #-----------------------------------------------------------------------------