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

Remove six #63

Merged
merged 4 commits into from
Jul 21, 2015
Merged

Remove six #63

merged 4 commits into from
Jul 21, 2015

Conversation

kwohlfahrt
Copy link
Member

Just a quick patch to get rid of six, as discussed in #61.

Pull request for travis, and for review to make sure I'm not doing anything stupid or stepping on toes.

If I'm OK to push small things like this in future let me know, and I'll stop bugging everybody else.

Kai Wohlfahrt added 3 commits July 17, 2015 17:24
Only string_types was used in six.
`_check_mode_input` was the only user of six. It was only used to check the
input of `MODES.from_object`, and raised a `TypeError` if a numeric mode was
out of range or a mode object was not a string type. `MODES.from_object` raises
a `ValueError` in these situations, and when the mode name string is not found.

Now, `MODES.from_object` is wrapped in a function `_try_mode` that returns its
result and fixes the type of any exception raised to keep the API the same.

This is a candidate for cleanup after the API break. Part of issue PyWavelets#61
@grlee77
Copy link
Contributor

grlee77 commented Jul 17, 2015

nice. this looks good to me

I would encourage not merging one's own pull request unless it is a trivial documentation change or something. If it is something small like this and you are not getting feedback, I would just state something like "will merge in 2 days unless there are any objections". I will plan to merge this one on Monday or Tuesday to give some time for other feedback.

I didn't realize six.py was the only thing in _tools, removing now as it
contains nothing.
grlee77 added a commit that referenced this pull request Jul 21, 2015
@grlee77 grlee77 merged commit 9f4d295 into PyWavelets:master Jul 21, 2015
@kwohlfahrt kwohlfahrt deleted the quick-fixes branch July 22, 2015 09:16
@rgommers
Copy link
Member

Nice, good to get rid of six

@rgommers rgommers modified the milestone: v0.3.0 Jul 22, 2015
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.

3 participants