##// END OF EJS Templates
upstream » ipython
RSS

Clone from https://github.com/ipython/ipython.git

Merge pull request #11054 from teddyrendahl/fix_load_profile_import...
Thomas Kluyver -
r24225:631f5fe2 merge
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -20,7 +20,7 b' import threading'
20 from traitlets.config.configurable import LoggingConfigurable
20 from traitlets.config.configurable import LoggingConfigurable
21 from decorator import decorator
21 from decorator import decorator
22 from IPython.utils.decorators import undoc
22 from IPython.utils.decorators import undoc
23 from IPython.utils.path import locate_profile
23 from IPython.paths import locate_profile
24 from traitlets import (
24 from traitlets import (
25 Any, Bool, Dict, Instance, Integer, List, Unicode, TraitError,
25 Any, Bool, Dict, Instance, Integer, List, Unicode, TraitError,
26 default, observe,
26 default, observe,
General Comments 0
You need to be logged in to leave comments. Login now