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.

Sign up for GitHub

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

Jump to bottom

bpo-37810: Fix difflib ? hint in diff output when dealing with tabs #15201

Merged
merged 1 commit into from
Aug 21, 2019
Merged

bpo-37810: Fix difflib ? hint in diff output when dealing with tabs #15201

merged 1 commit into from
Aug 21, 2019

Conversation

asottile
Copy link
Contributor

@asottile asottile commented Aug 10, 2019 •
edited by bedevere-bot
Loading

@asottile asottile changed the title bpo-37810 Fix difflib ? hint in diff output when dealing with tabs bpo-37810: Fix difflib ? hint in diff output when dealing with tabs Aug 10, 2019
tim-one
tim-one suggested changes Aug 21, 2019
View reviewed changes
Copy link
Member

@tim-one tim-one left a comment

Choose a reason for hiding this comment

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

This is a fine idea, much better than the original hack! As noted, I'd like to see some changes.

Lib/difflib.py Outdated Show resolved Hide resolved
@bedevere-bot
Copy link

A Python core developer has requested some changes be made to your pull request before we can consider merging it. If you could please address their requests along with any other requests in other reviews from core developers that would be appreciated.

Once you have made the requested changes, please leave a comment on this pull request containing the phrase I have made the requested changes; please review again. I will then notify any core developers who have left a review that you're ready for them to take another look at this pull request.

@asottile asottile force-pushed the fix_difflib_with_tabs_bpo_37810 branch from 4c1e273 to 35eacb6 Compare August 21, 2019 15:45
@asottile
Copy link
Contributor Author

I didn't expect the Spanish Inquisition!

@bedevere-bot
Copy link

Nobody expects the Spanish Inquisition!

@tim-one: please review the changes made to this pull request.

@tim-one tim-one merged commit e1c638d into python:master Aug 21, 2019
@bedevere-bot
Copy link

@tim-one: Please replace # with GH- in the commit message next time. Thanks!

@miss-islington
Copy link
Contributor

Thanks @asottile for the PR, and @tim-one for merging it 🌮🎉.. I'm working now to backport this PR to: 3.8.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Aug 21, 2019
@asottile @miss-islington
Fix difflib ? hint in diff output when dealing with tabs (pythonGH-…
5a1aac1 
…15201)

(cherry picked from commit e1c638d)

Co-authored-by: Anthony Sottile <asottile@umich.edu>
@bedevere-bot
Copy link

GH-15365 is a backport of this pull request to the 3.8 branch.

miss-islington added a commit that referenced this pull request Aug 21, 2019
@miss-islington @asottile
Fix difflib ? hint in diff output when dealing with tabs (GH-15201)
7e293f5 
(cherry picked from commit e1c638d)

Co-authored-by: Anthony Sottile <asottile@umich.edu>
@asottile asottile deleted the fix_difflib_with_tabs_bpo_37810 branch September 2, 2019 19:25
lisroach pushed a commit to lisroach/cpython that referenced this pull request Sep 10, 2019
@asottile @lisroach
Fix difflib ? hint in diff output when dealing with tabs (python#15201
57951bb 
)
DinoV pushed a commit to DinoV/cpython that referenced this pull request Jan 14, 2020
@asottile @DinoV
Fix difflib ? hint in diff output when dealing with tabs (python#15201
ec9fe8b 
)
websurfer5 pushed a commit to websurfer5/cpython that referenced this pull request Jul 20, 2020
@asottile @websurfer5
Fix difflib ? hint in diff output when dealing with tabs (python#15201
8dbffad 
)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tim-one tim-one tim-one approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@asottile @bedevere-bot @miss-islington @tim-one @the-knights-who-say-ni