Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Ipy3 preparation #159

Closed
wants to merge 0 commits into from

2 participants

@takluyver
Owner

This is my Python 2 branch to tidy up code for simpler automatic conversion to Python 3. It passes the test suite on my machine, although of course you may want to test it further.

Most of the changes shouldn't affect how the code works. They consist largely of dropping compatibility with older versions of Python. Fernando indicated that we can target Python 2.6 for IPython 0.11. The exception is the import_item function, which I rewrote using __import__. I don't know if there's a case in which that wouldn't work.

Thanks,
Thomas

@fperez
Owner

Very minor note:

Otherwise the changes look perfect. Let me know what you want to do with that one, and I'll go ahead and merge.

Great work, thanks!

@takluyver
Owner

I'd left it to hand in case I'd overlooked some reason for using the original method: if you're satisfied that it does the same job, that's fine (7dfe077 removes it). Of course, it can always be retrieved from earlier versions if it is needed.

@fperez
Owner

Got it, thanks. In that case, I'm actually going to merge it with a note that this was old code which can be removed once we're 100% sure nothing got screwed up. It may save time if there's a problem, to someone looking for a fix, to have the old one right there instead of just in git's history.

Note (I'll send an email to the list about this): in general please don't merge from trunk into feature branches, to avoid criss-cross merges. Keep feature branches fast-forwarding as they evolve, or even rebase them if truly necessary. It makes the merge history much cleaner, and it's not an issue of pickiness, but of being able to more easily analyze in isolation what the branch does compared to the trunk (which a merge makes difficult).

I'll make the merge with your state pior to 753f7eb, and will add the builtins fix as well as a comment on the code from 7dfe077.

Thanks for the great work, this should be merged and closed in a minute.

@takluyver
Owner

Thanks. I'm not too familiar with the best way to use DVCS, but I'll keep any branches branched in future.

@fperez
Owner

Merge branch 'takowl-ipy3-preparation' into trunk

This branch cleans up our trunk to make a 2to3 run be as painless as
possible, while keeping our code fully 2.6-compatible.

Closed by 572d3d7 (pull request).

@jtriley jtriley referenced this pull request from a commit in jtriley/ipython
@fperez fperez Merge branch 'takowl-ipy3-preparation' into trunk
This branch cleans up our trunk to make a 2to3 run be as painless as
possible, while keeping our code fully 2.6-compatible.

Closes gh-159 (pull request).
572d3d7
@fperez fperez referenced this pull request from a commit
Commit has since been removed from the repository and is no longer available.
@damianavila damianavila referenced this pull request from a commit
Commit has since been removed from the repository and is no longer available.
@mattvonrocketstein mattvonrocketstein referenced this pull request from a commit in mattvonrocketstein/ipython
@fperez fperez Merge branch 'takowl-ipy3-preparation' into trunk
This branch cleans up our trunk to make a 2to3 run be as painless as
possible, while keeping our code fully 2.6-compatible.

Closes gh-159 (pull request).
edc0c2a
This issue was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

takluyver:ipy3-preparation was force-pushed and no longer has any new commits.

Pushing new commits will allow the pull request to be re-opened.

This page is out of date. Refresh to see the latest.

takluyver:ipy3-preparation was force-pushed and no longer has any new commits.

Pushing new commits will allow the pull request to be re-opened.

Something went wrong with that request. Please try again.