##// END OF EJS Templates
make config_file_paths List instead of Unicode
MinRK -
Show More
@@ -34,7 +34,7 b' import sys'
34 from IPython.config.application import Application
34 from IPython.config.application import Application
35 from IPython.core import release, crashhandler
35 from IPython.core import release, crashhandler
36 from IPython.utils.path import get_ipython_dir, get_ipython_package_dir
36 from IPython.utils.path import get_ipython_dir, get_ipython_package_dir
37 from IPython.utils.traitlets import Tuple, Unicode, Type
37 from IPython.utils.traitlets import List, Unicode, Type
38
38
39 #-----------------------------------------------------------------------------
39 #-----------------------------------------------------------------------------
40 # Classes and functions
40 # Classes and functions
@@ -56,9 +56,9 b' class BaseIPythonApplication(Application):'
56 os.path.join(get_ipython_package_dir(), u'config', u'profile')
56 os.path.join(get_ipython_package_dir(), u'config', u'profile')
57 )
57 )
58
58
59 config_file_paths = Tuple(Unicode, Unicode, Unicode)
59 config_file_paths = List(Unicode)
60 def _config_file_paths_default(self):
60 def _config_file_paths_default(self):
61 return (os.getcwdu(), self.ipython_dir, self.builtin_profile_dir)
61 return [os.getcwdu(), self.ipython_dir, self.builtin_profile_dir]
62
62
63 profile_name = Unicode(u'', config=True,
63 profile_name = Unicode(u'', config=True,
64 help="""The IPython profile to use."""
64 help="""The IPython profile to use."""
General Comments 0
You need to be logged in to leave comments. Login now