diff --git a/IPython/config/loader.py b/IPython/config/loader.py index 027253a..fc5374b 100644 --- a/IPython/config/loader.py +++ b/IPython/config/loader.py @@ -30,7 +30,7 @@ import sys from IPython.external import argparse from IPython.utils.path import filefind, get_ipython_dir -from IPython.utils import py3compat, text, warn +from IPython.utils import py3compat, warn from IPython.utils.encoding import DEFAULT_ENCODING #----------------------------------------------------------------------------- @@ -498,8 +498,6 @@ class KeyValueConfigLoader(CommandLineConfigLoader): or dicts. When the flag is triggered, The config is loaded as `self.config.update(cfg)`. """ - from IPython.config.configurable import Configurable - self.clear() if argv is None: argv = self.argv diff --git a/IPython/config/tests/test_application.py b/IPython/config/tests/test_application.py index 06ce2e3..97225d4 100644 --- a/IPython/config/tests/test_application.py +++ b/IPython/config/tests/test_application.py @@ -28,7 +28,7 @@ from IPython.config.application import ( ) from IPython.utils.traitlets import ( - Bool, Unicode, Integer, Float, List, Dict + Bool, Unicode, Integer, List, Dict ) #----------------------------------------------------------------------------- diff --git a/IPython/config/tests/test_configurable.py b/IPython/config/tests/test_configurable.py index 88b087d..d611eb4 100644 --- a/IPython/config/tests/test_configurable.py +++ b/IPython/config/tests/test_configurable.py @@ -161,7 +161,6 @@ class TestConfigurable(TestCase): class TestSingletonConfigurable(TestCase): def test_instance(self): - from IPython.config.configurable import SingletonConfigurable class Foo(SingletonConfigurable): pass self.assertEqual(Foo.initialized(), False) foo = Foo.instance() diff --git a/IPython/config/tests/test_loader.py b/IPython/config/tests/test_loader.py index 2d09f1d..5b9b647 100644 --- a/IPython/config/tests/test_loader.py +++ b/IPython/config/tests/test_loader.py @@ -28,8 +28,6 @@ from nose import SkipTest from IPython.testing.tools import mute_warn -from IPython.utils.traitlets import Unicode -from IPython.config.configurable import Configurable from IPython.config.loader import ( Config, PyFileConfigLoader,