Merge pull request #964 from takluyver/default-profile

Python 3 being fully supported, it is no longer relegated to a special profile.
Users of both Python 3 and Python 2 will now get the same default profile (history, config, etc.) in each.

Closes gh-939, fixing the profile directory and magic in the IPython kernel.

IPython/core/application.py

@@ -104,11 +104,9 b' 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 b' 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:

IPython/core/magic.py

@@ -527,7 +527,11 b' Currently the magic system has the following functions:\\n"""'
 
     def magic_profile(self, parameter_s=''):
         """Print your currently active IPython profile."""
-        print self.shell.profile
+        from IPython.core.application import BaseIPythonApplication
+        if BaseIPythonApplication.initialized():
+            print BaseIPythonApplication.instance().profile
+        else:
+            error("profile is an application-level value, but you don't appear to be in an IPython application")
 
     def magic_pinfo(self, parameter_s='', namespaces=None):
         """Provide detailed information about an object.

IPython/core/tests/test_profile.py

@@ -80,7 +80,7 b' def test_startup_py():'
     # write simple test file, to check that the startup file was run
     fname = os.path.join(TMP_TEST_DIR, 'test.py')
     with open(fname, 'w') as f:
-        f.write('print zzz\n')
+        f.write(py3compat.doctest_refactor_print('print zzz\n'))
     # validate output
     tt.ipexec_validate(fname, '123', '', 
         options=['--ipython-dir', IP_TEST_DIR, '--profile', 'test'])
@@ -100,4 +100,4 b' def test_startup_ipy():'
     tt.ipexec_validate(fname, 'test', '', 
         options=['--ipython-dir', IP_TEST_DIR, '--profile', 'test'])
     
-    
  No newline at end of file
+    

IPython/zmq/ipkernel.py

@@ -64,6 +64,7 b' class Kernel(Configurable):'
 
     shell = Instance('IPython.core.interactiveshell.InteractiveShellABC')
     session = Instance(Session)
+    profile_dir = Instance('IPython.core.profiledir.ProfileDir')
     shell_socket = Instance('zmq.Socket')
     iopub_socket = Instance('zmq.Socket')
     stdin_socket = Instance('zmq.Socket')
@@ -106,7 +107,9 b' class Kernel(Configurable):'
         atexit.register(self._at_shutdown)
 
         # Initialize the InteractiveShell subclass
-        self.shell = ZMQInteractiveShell.instance(config=self.config)
+        self.shell = ZMQInteractiveShell.instance(config=self.config,
+            profile_dir = self.profile_dir,
+        )
         self.shell.displayhook.session = self.session
         self.shell.displayhook.pub_socket = self.iopub_socket
         self.shell.display_pub.session = self.session
@@ -739,16 +742,16 b' class IPKernelApp(KernelApp, InteractiveShellApp):'
         self.init_code()
 
     def init_kernel(self):
-        kernel_factory = Kernel
 
         if self.pylab:
             gui, backend = pylabtools.find_gui_and_backend(self.pylab)
 
-        kernel = kernel_factory(config=self.config, session=self.session,
+        kernel = Kernel(config=self.config, session=self.session,
                                 shell_socket=self.shell_socket,
                                 iopub_socket=self.iopub_socket,
                                 stdin_socket=self.stdin_socket,
                                 log=self.log,
+                                profile_dir=self.profile_dir,
         )
         self.kernel = kernel
         kernel.record_ports(self.ports)