##// END OF EJS Templates
Revert to using single default profile for Python 2 and 3.
Thomas Kluyver -
Show More
@@ -104,11 +104,9 b' class BaseIPythonApplication(Application):'
104 def _config_file_paths_default(self):
104 def _config_file_paths_default(self):
105 return [os.getcwdu()]
105 return [os.getcwdu()]
106
106
107 profile = Unicode(u'', config=True,
107 profile = Unicode(u'default', config=True,
108 help="""The IPython profile to use."""
108 help="""The IPython profile to use."""
109 )
109 )
110 def _profile_default(self):
111 return "python3" if py3compat.PY3 else "default"
112
110
113 def _profile_changed(self, name, old, new):
111 def _profile_changed(self, name, old, new):
114 self.builtin_profile_dir = os.path.join(
112 self.builtin_profile_dir = os.path.join(
@@ -230,7 +228,7 b' class BaseIPythonApplication(Application):'
230 p = ProfileDir.find_profile_dir_by_name(self.ipython_dir, self.profile, self.config)
228 p = ProfileDir.find_profile_dir_by_name(self.ipython_dir, self.profile, self.config)
231 except ProfileDirError:
229 except ProfileDirError:
232 # not found, maybe create it (always create default profile)
230 # not found, maybe create it (always create default profile)
233 if self.auto_create or self.profile==self._profile_default():
231 if self.auto_create or self.profile=='default':
234 try:
232 try:
235 p = ProfileDir.create_profile_dir_by_name(self.ipython_dir, self.profile, self.config)
233 p = ProfileDir.create_profile_dir_by_name(self.ipython_dir, self.profile, self.config)
236 except ProfileDirError:
234 except ProfileDirError:
General Comments 0
You need to be logged in to leave comments. Login now