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

Rename abort_queues --> _abort_queues #6374

Merged
merged 1 commit into from Aug 29, 2014
Merged

Conversation

dhirschfeld
Copy link

No description provided.

@dhirschfeld
Copy link
Author

Seems there's some whitespace noise. I'll force-push a fix for that.

Isn't the recommended practice to strip trailing whitespace though?

@Carreau
Copy link
Member

Carreau commented Aug 28, 2014

Seems there's some whitespace noise. I'll force-push a fix for that.

Thanks !

Isn't the recommended practice to strip trailing whitespace though?

Only on lines adjacent to actual changes, otherwise it's hard to use git blame to track reason of changes.

@Carreau Carreau added this to the 2.3 milestone Aug 28, 2014
@dhirschfeld
Copy link
Author

Missed one line at the bottom, but hopefully that's acceptable!

@Carreau
Copy link
Member

Carreau commented Aug 28, 2014

Missed one line at the bottom, but hopefully that's acceptable!

It's compensated by the typo in the docstring :-)

@minrk
Copy link
Member

minrk commented Aug 28, 2014

Isn't the recommended practice to strip trailing whitespace though?

No, actually not ever.

@minrk
Copy link
Member

minrk commented Aug 28, 2014

Missed one line at the bottom, but hopefully that's acceptable!

Yes, totally fine. We don't mind any small whitespace changes, especially around the code you are working on. It's just a good idea to avoid making large unrelated changes.

@dhirschfeld would you be willing to squash your two commits into one? This PR now has two large whitespace changes, even though the net diff doesn't have any.

@dhirschfeld
Copy link
Author

Squashed!

@minrk
Copy link
Member

minrk commented Aug 29, 2014

Thanks for putting up with our foibles.

minrk added a commit that referenced this pull request Aug 29, 2014
Rename `abort_queues` --> `_abort_queues`
@minrk minrk merged commit 13e42d6 into ipython:master Aug 29, 2014
@dhirschfeld dhirschfeld deleted the about_queues branch August 31, 2014 18:43
@dhirschfeld
Copy link
Author

Not a problem - I can fully appreciate the need to have strong and consistent development practices.

takluyver added a commit that referenced this pull request Sep 11, 2014
mattvonrocketstein pushed a commit to mattvonrocketstein/ipython that referenced this pull request Nov 3, 2014
Rename `abort_queues` --> `_abort_queues`
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.

None yet

4 participants