Show More
@@ -30,7 +30,7 import sys | |||||
30 |
|
30 | |||
31 | from IPython.external import argparse |
|
31 | from IPython.external import argparse | |
32 | from IPython.utils.path import filefind, get_ipython_dir |
|
32 | from IPython.utils.path import filefind, get_ipython_dir | |
33 |
from IPython.utils import py3compat, |
|
33 | from IPython.utils import py3compat, warn | |
34 | from IPython.utils.encoding import DEFAULT_ENCODING |
|
34 | from IPython.utils.encoding import DEFAULT_ENCODING | |
35 |
|
35 | |||
36 | #----------------------------------------------------------------------------- |
|
36 | #----------------------------------------------------------------------------- | |
@@ -498,8 +498,6 class KeyValueConfigLoader(CommandLineConfigLoader): | |||||
498 | or dicts. When the flag is triggered, The config is loaded as |
|
498 | or dicts. When the flag is triggered, The config is loaded as | |
499 | `self.config.update(cfg)`. |
|
499 | `self.config.update(cfg)`. | |
500 | """ |
|
500 | """ | |
501 | from IPython.config.configurable import Configurable |
|
|||
502 |
|
||||
503 | self.clear() |
|
501 | self.clear() | |
504 | if argv is None: |
|
502 | if argv is None: | |
505 | argv = self.argv |
|
503 | argv = self.argv |
@@ -28,7 +28,7 from IPython.config.application import ( | |||||
28 | ) |
|
28 | ) | |
29 |
|
29 | |||
30 | from IPython.utils.traitlets import ( |
|
30 | from IPython.utils.traitlets import ( | |
31 |
Bool, Unicode, Integer, |
|
31 | Bool, Unicode, Integer, List, Dict | |
32 | ) |
|
32 | ) | |
33 |
|
33 | |||
34 | #----------------------------------------------------------------------------- |
|
34 | #----------------------------------------------------------------------------- |
@@ -161,7 +161,6 class TestConfigurable(TestCase): | |||||
161 | class TestSingletonConfigurable(TestCase): |
|
161 | class TestSingletonConfigurable(TestCase): | |
162 |
|
162 | |||
163 | def test_instance(self): |
|
163 | def test_instance(self): | |
164 | from IPython.config.configurable import SingletonConfigurable |
|
|||
165 | class Foo(SingletonConfigurable): pass |
|
164 | class Foo(SingletonConfigurable): pass | |
166 | self.assertEqual(Foo.initialized(), False) |
|
165 | self.assertEqual(Foo.initialized(), False) | |
167 | foo = Foo.instance() |
|
166 | foo = Foo.instance() |
@@ -28,8 +28,6 from nose import SkipTest | |||||
28 |
|
28 | |||
29 | from IPython.testing.tools import mute_warn |
|
29 | from IPython.testing.tools import mute_warn | |
30 |
|
30 | |||
31 | from IPython.utils.traitlets import Unicode |
|
|||
32 | from IPython.config.configurable import Configurable |
|
|||
33 | from IPython.config.loader import ( |
|
31 | from IPython.config.loader import ( | |
34 | Config, |
|
32 | Config, | |
35 | PyFileConfigLoader, |
|
33 | PyFileConfigLoader, |
General Comments 0
You need to be logged in to leave comments.
Login now