Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions IPython/core/application.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,9 @@ def _config_file_name_changed(self, name, old, new):
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(
Expand Down Expand Up @@ -230,7 +228,7 @@ def init_profile_dir(self):
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:
Expand Down
6 changes: 5 additions & 1 deletion IPython/core/magic.py
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,11 @@ def magic_page(self, parameter_s=''):

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.
Expand Down
4 changes: 2 additions & 2 deletions IPython/core/tests/test_profile.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ 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'))

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@takluyver, when you get a chance, do you want to toss together a writeup of the py3compat stuff? The unicode_to_str, etc. is clear enough, but some of these would warrant a good doc, so we don't make you keep fixing our tests, etc. for py3 quite so often.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure. I'll put something together on the wiki.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! this branch has been merged.

# validate output
tt.ipexec_validate(fname, '123', '',
options=['--ipython-dir', IP_TEST_DIR, '--profile', 'test'])
Expand All @@ -100,4 +100,4 @@ def test_startup_ipy():
tt.ipexec_validate(fname, 'test', '',
options=['--ipython-dir', IP_TEST_DIR, '--profile', 'test'])



9 changes: 6 additions & 3 deletions IPython/zmq/ipkernel.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ 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')
Expand Down Expand Up @@ -106,7 +107,9 @@ def __init__(self, **kwargs):
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
Expand Down Expand Up @@ -739,16 +742,16 @@ def initialize(self, argv=None):
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)
Expand Down