update traitlets imports

traitlets/__init__.py

@@ -1,1 +1,5 b''
+# FIXME: import IPython first, to avoid circular imports
+# this shouldn't be needed after finishing the big split
+import IPython
+
 from .traitlets import *

traitlets/config/application.py

@@ -16,12 +16,12 b' from collections import defaultdict'
 
 from decorator import decorator
 
-from IPython.config.configurable import SingletonConfigurable
-from IPython.config.loader import (
+from traitlets.config.configurable import SingletonConfigurable
+from traitlets.config.loader import (
     KVArgParseConfigLoader, PyFileConfigLoader, Config, ArgumentError, ConfigFileNotFound, JSONFileConfigLoader
 )
 
-from IPython.utils.traitlets import (
+from traitlets.traitlets import (
     Unicode, List, Enum, Dict, Instance, TraitError
 )
 from IPython.utils.importstring import import_item
@@ -227,7 +227,7 b' class Application(SingletonConfigurable):'
     # and the second being the help string for the subcommand
     subcommands = Dict()
     # parse_command_line will initialize a subapp, if requested
-    subapp = Instance('IPython.config.application.Application', allow_none=True)
+    subapp = Instance('traitlets.config.application.Application', allow_none=True)
 
     # extra command-line arguments that don't set config values
     extra_args = List(Unicode)

traitlets/config/configurable.py

@@ -10,7 +10,7 b' import logging'
 from copy import deepcopy
 
 from .loader import Config, LazyConfigValue
-from IPython.utils.traitlets import HasTraits, Instance
+from traitlets.traitlets import HasTraits, Instance
 from IPython.utils.text import indent, wrap_paragraphs
 from IPython.utils.py3compat import iteritems
 
@@ -34,7 +34,7 b' class MultipleInstanceError(ConfigurableError):'
 class Configurable(HasTraits):
 
     config = Instance(Config, (), {})
-    parent = Instance('IPython.config.configurable.Configurable', allow_none=True)
+    parent = Instance('traitlets.config.configurable.Configurable', allow_none=True)
 
     def __init__(self, **kwargs):
         """Create a configurable given a config config.
@@ -329,7 +329,7 b' class SingletonConfigurable(Configurable):'
 
         Create a singleton class using instance, and retrieve it::
 
-            >>> from IPython.config.configurable import SingletonConfigurable
+            >>> from traitlets.config.configurable import SingletonConfigurable
             >>> class Foo(SingletonConfigurable): pass
             >>> foo = Foo.instance()
             >>> foo == Foo.instance()

traitlets/config/loader.py

@@ -17,7 +17,7 b' from IPython.utils.path import filefind, get_ipython_dir'
 from IPython.utils import py3compat
 from IPython.utils.encoding import DEFAULT_ENCODING
 from IPython.utils.py3compat import unicode_type, iteritems
-from IPython.utils.traitlets import HasTraits, List, Any
+from traitlets.traitlets import HasTraits, List, Any
 
 #-----------------------------------------------------------------------------
 # Exceptions
@@ -330,7 +330,7 b' class ConfigLoader(object):'
         """A base class for config loaders.
 
         log : instance of :class:`logging.Logger` to use.
-              By default loger of :meth:`IPython.config.application.Application.instance()`
+              By default loger of :meth:`traitlets.config.application.Application.instance()`
               will be used
 
         Examples
@@ -558,7 +558,7 b' class KeyValueConfigLoader(CommandLineConfigLoader):'
         Examples
         --------
 
-            >>> from IPython.config.loader import KeyValueConfigLoader
+            >>> from traitlets.config.loader import KeyValueConfigLoader
             >>> cl = KeyValueConfigLoader()
             >>> d = cl.load_config(["--A.name='brian'","--B.number=0"])
             >>> sorted(d.items())

traitlets/config/manager.py

@@ -7,9 +7,9 b' import io'
 import json
 import os
 
-from IPython.config import LoggingConfigurable
+from traitlets.config import LoggingConfigurable
 from IPython.utils.py3compat import PY3
-from IPython.utils.traitlets import Unicode
+from traitlets.traitlets import Unicode
 
 
 def recursive_update(target, new):

traitlets/config/tests/test_application.py

@@ -1,6 +1,6 b''
 # coding: utf-8
 """
-Tests for IPython.config.application.Application
+Tests for traitlets.config.application.Application
 """
 
 # Copyright (c) IPython Development Team.
@@ -15,15 +15,15 b' pjoin = os.path.join'
 
 import nose.tools as nt
 
-from IPython.config.configurable import Configurable
-from IPython.config.loader import Config
+from traitlets.config.configurable import Configurable
+from traitlets.config.loader import Config
 
-from IPython.config.application import (
+from traitlets.config.application import (
     Application
 )
 
 from IPython.utils.tempdir import TemporaryDirectory
-from IPython.utils.traitlets import (
+from traitlets.traitlets import (
     Bool, Unicode, Integer, List, Dict
 )
 

traitlets/config/tests/test_configurable.py

@@ -1,21 +1,21 b''
 # encoding: utf-8
-"""Tests for IPython.config.configurable"""
+"""Tests for traitlets.config.configurable"""
 
 # Copyright (c) IPython Development Team.
 # Distributed under the terms of the Modified BSD License.
 
 from unittest import TestCase
 
-from IPython.config.configurable import (
+from traitlets.config.configurable import (
     Configurable, 
     SingletonConfigurable
 )
 
-from IPython.utils.traitlets import (
+from traitlets.traitlets import (
     Integer, Float, Unicode, List, Dict, Set,
 )
 
-from IPython.config.loader import Config
+from traitlets.config.loader import Config
 from IPython.utils.py3compat import PY3
 
 

traitlets/config/tests/test_loader.py

@@ -1,5 +1,5 b''
 # encoding: utf-8
-"""Tests for IPython.config.loader"""
+"""Tests for traitlets.config.loader"""
 
 # Copyright (c) IPython Development Team.
 # Distributed under the terms of the Modified BSD License.
@@ -18,7 +18,7 b' import nose.tools as nt'
 
 
 
-from IPython.config.loader import (
+from traitlets.config.loader import (
     Config,
     LazyConfigValue,
     PyFileConfigLoader,

traitlets/traitlets.py

@@ -53,10 +53,10 b' except:'
     ClassTypes = (type,)
 from warnings import warn
 
-from .getargspec import getargspec
-from .importstring import import_item
 from IPython.utils import py3compat
 from IPython.utils import eventful
+from IPython.utils.getargspec import getargspec
+from IPython.utils.importstring import import_item
 from IPython.utils.py3compat import iteritems, string_types
 from IPython.testing.skipdoctest import skip_doctest