Skip to content

Default profile #964

Merged
merged 3 commits into from Nov 2, 2011

2 participants

@takluyver
IPython member

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
IPython member

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

@minrk
IPython member
minrk commented Nov 2, 2011

Looks good to me, thanks!

@minrk minrk commented on the diff Nov 2, 2011
IPython/core/tests/test_profile.py
@@ -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'))
@minrk
IPython member
minrk added a note Nov 2, 2011

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

@takluyver
IPython member
takluyver added a note Nov 2, 2011
@minrk
IPython member
minrk added a note Nov 2, 2011
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@minrk minrk merged commit c3d885f into ipython:master Nov 2, 2011
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Something went wrong with that request. Please try again.