Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Python 3 builtins via six #1699

Merged
merged 5 commits into from
Jun 22, 2015
Merged

Python 3 builtins via six #1699

merged 5 commits into from
Jun 22, 2015

Conversation

QuLogic
Copy link
Member

@QuLogic QuLogic commented Jun 12, 2015

Replace the builtins that are different on Python 3 using six. This only includes changes in files where these functions are used. I'll open a second PR adding these new builtins to the remaining files later.

This is a really, really, really, really long long_name that must be clipped... x
Copy link
Member

Choose a reason for hiding this comment

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

curious....

@pelson
Copy link
Member

pelson commented Jun 12, 2015

If tests pass 👍. Please keep 3c9fc9f as a base commit, putting subsequent work on top of that.

@pelson pelson mentioned this pull request Jun 12, 2015
@QuLogic
Copy link
Member Author

QuLogic commented Jun 12, 2015

OK, tests pass, but there might be one filter I missed somewhere that isn't caught right now. I'd prefer to have it in this PR instead of the next blanket one, so hold on for a bit.

@QuLogic QuLogic force-pushed the py3k-six-builtins branch from 3c9fc9f to 41deaa9 Compare June 12, 2015 09:09
@QuLogic
Copy link
Member Author

QuLogic commented Jun 12, 2015

Ah, I just missed the .krb file, so I think it should be good now (once tests pass).

@pelson
Copy link
Member

pelson commented Jun 12, 2015

Seems problematic...

QuLogic added 5 commits June 12, 2015 18:23
In some cases, switch to np.arange where it's clearer.
In most cases, no other changes were necessary since the result was used
in a for loop.
Again, mostly unchanged except for the import.
Modernize seems to want to turn most filter calls into list
comprehensions.
@QuLogic QuLogic force-pushed the py3k-six-builtins branch from 41deaa9 to 77335a5 Compare June 12, 2015 22:24
@QuLogic
Copy link
Member Author

QuLogic commented Jun 12, 2015

Oops, I shouldn't do this so late at night...

@QuLogic QuLogic mentioned this pull request Jun 13, 2015
pelson added a commit that referenced this pull request Jun 22, 2015
@pelson pelson merged commit 06dafd4 into SciTools:master Jun 22, 2015
@QuLogic QuLogic deleted the py3k-six-builtins branch June 22, 2015 20:58
@QuLogic QuLogic added this to the v1.9.0 milestone Jul 26, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants