From 1805a5bb2b157ae3f2e583df58a28c93ae84800c 2011-11-01 20:10:32 From: Thomas Kluyver Date: 2011-11-01 20:10:32 Subject: [PATCH] Revert to using single default profile for Python 2 and 3. --- diff --git a/IPython/core/application.py b/IPython/core/application.py index 2399985..64656e4 100644 --- a/IPython/core/application.py +++ b/IPython/core/application.py @@ -104,11 +104,9 @@ class BaseIPythonApplication(Application): def _config_file_paths_default(self): return [os.getcwdu()] - profile = Unicode(u'', config=True, + profile = Unicode(u'default', config=True, help="""The IPython profile to use.""" ) - def _profile_default(self): - return "python3" if py3compat.PY3 else "default" def _profile_changed(self, name, old, new): self.builtin_profile_dir = os.path.join( @@ -230,7 +228,7 @@ class BaseIPythonApplication(Application): p = ProfileDir.find_profile_dir_by_name(self.ipython_dir, self.profile, self.config) except ProfileDirError: # not found, maybe create it (always create default profile) - if self.auto_create or self.profile==self._profile_default(): + if self.auto_create or self.profile=='default': try: p = ProfileDir.create_profile_dir_by_name(self.ipython_dir, self.profile, self.config) except ProfileDirError: