Default profile #964

Merged
merged 3 commits into from Nov 2, 2011

Conversation

Projects
None yet
2 participants
@takluyver
Member

takluyver commented Nov 1, 2011

As discussed, this makes the default profile the same for Python 2 and 3.

Also includes a fix for a new test that was failing on Python 3.

@takluyver

This comment has been minimized.

Show comment
Hide comment
@takluyver

takluyver Nov 1, 2011

Member

Now also includes Min's fix so starting the qtconsole and specifying a different profile works properly (#939).

Member

takluyver commented Nov 1, 2011

Now also includes Min's fix so starting the qtconsole and specifying a different profile works properly (#939).

@minrk

This comment has been minimized.

Show comment
Hide comment
@minrk

minrk Nov 2, 2011

Member

Looks good to me, thanks!

Member

minrk commented Nov 2, 2011

Looks good to me, thanks!

@@ -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'))

This comment has been minimized.

@minrk

minrk Nov 2, 2011

Member

@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.

@minrk

minrk Nov 2, 2011

Member

@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.

This comment has been minimized.

@takluyver

takluyver Nov 2, 2011

Member

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

@takluyver

takluyver Nov 2, 2011

Member

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

This comment has been minimized.

This comment has been minimized.

@minrk

minrk Nov 2, 2011

Member

Thanks! this branch has been merged.

@minrk

minrk Nov 2, 2011

Member

Thanks! this branch has been merged.

minrk added a commit that referenced this pull request Nov 2, 2011

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.

@minrk minrk merged commit c3d885f into ipython:master Nov 2, 2011

mattvonrocketstein pushed a commit to mattvonrocketstein/ipython that referenced this pull request Nov 3, 2014

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.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment