Skip to content

bpo-31047: Fix ntpath.abspath to trim ending separator#10082

Merged
zooba merged 1 commit intopython:masterfrom
timgraham:31047
Oct 25, 2018
Merged

bpo-31047: Fix ntpath.abspath to trim ending separator#10082
zooba merged 1 commit intopython:masterfrom
timgraham:31047

Conversation

@timgraham
Copy link
Copy Markdown
Contributor

@timgraham timgraham commented Oct 24, 2018 •
edited by terryjreedy
Loading

@bedevere-bot bedevere-bot added tests Tests in the Lib/test dir awaiting review labels Oct 24, 2018
@timgraham timgraham force-pushed the 31047 branch 3 times, most recently from 6ff5c58 to e310ca5 Compare October 24, 2018 22:33
ned-deily
ned-deily requested changes Oct 25, 2018
View reviewed changes
Comment thread Misc/NEWS.d/next/Library/2018-10-24-17-43-21.bpo-33899.kBbX8r.rst Outdated
Copy link
Copy Markdown
Member

@ned-deily ned-deily Oct 25, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

The PR title and NEWS entry appear to reference the wrong issue: bpo-33899 is a tokenizer issue. It should be bpo-31047, no? If so, please rerun blub and delete this NEWS file and fix the PR title. Thanks!

@bedevere-bot
Copy link
Copy Markdown

bedevere-bot commented Oct 25, 2018

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.

@timgraham timgraham changed the title [wip] bpo-33899: Fix ntpath.abspath to trim ending separator [wip] bpo-31047: Fix ntpath.abspath to trim ending separator Oct 25, 2018
@zooba zooba added type-bug An unexpected behavior, bug, or error needs backport to 3.6 OS-windows labels Oct 25, 2018
@timgraham
Copy link
Copy Markdown
Contributor Author

timgraham commented Oct 25, 2018

I have made the requested changes; please review again.

@bedevere-bot
Copy link
Copy Markdown

bedevere-bot commented Oct 25, 2018

Thanks for making the requested changes!

@ned-deily: please review the changes made to this pull request.

@timgraham timgraham changed the title [wip] bpo-31047: Fix ntpath.abspath to trim ending separator bpo-31047: Fix ntpath.abspath to trim ending separator Oct 25, 2018
@zooba zooba merged commit d03b775 into python:master Oct 25, 2018
@miss-islington
Copy link
Copy Markdown
Contributor

miss-islington commented Oct 25, 2018

Thanks @timgraham for the PR, and @zooba for merging it 🌮🎉.. I'm working now to backport this PR to: 3.6, 3.7.
🐍🍒⛏🤖

@miss-islington
Copy link
Copy Markdown
Contributor

miss-islington commented Oct 25, 2018

Sorry, @timgraham and @zooba, I could not cleanly backport this to 3.7 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker d03b7757811ae51277f8ed399a9a0fd78dfd3425 3.7

@zooba
Copy link
Copy Markdown
Member

zooba commented Oct 25, 2018

Thanks! I merged without waiting for Ned - the change is good.

@miss-islington
Copy link
Copy Markdown
Contributor

miss-islington commented Oct 25, 2018

Sorry, @timgraham and @zooba, I could not cleanly backport this to 3.6 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker d03b7757811ae51277f8ed399a9a0fd78dfd3425 3.6

zooba pushed a commit to zooba/cpython that referenced this pull request Oct 25, 2018
@timgraham @zooba
bpo-31047: Fix ntpath.abspath to trim ending separator (pythonGH-10082)
c3d5470 
Regression in b0bf51b.
@bedevere-bot
Copy link
Copy Markdown

bedevere-bot commented Oct 25, 2018

GH-10096 is a backport of this pull request to the 3.7 branch.

zooba pushed a commit to zooba/cpython that referenced this pull request Oct 25, 2018
@timgraham @zooba
bpo-31047: Fix ntpath.abspath to trim ending separator (pythonGH-10082)
3888c25 
Regression in b0bf51b.
@bedevere-bot
Copy link
Copy Markdown

bedevere-bot commented Oct 25, 2018

GH-10097 is a backport of this pull request to the 3.6 branch.

@terryjreedy
Copy link
Copy Markdown
Member

terryjreedy commented Oct 25, 2018

When one changes an erroneous issue number in the title, one needs to change the issue link in the initial message and unlink the PR from the issue where it it irrelevant. I did that for 33899.

zooba added a commit that referenced this pull request Oct 25, 2018
@zooba
[3.7] bpo-31047: Fix ntpath.abspath to trim ending separator (GH-10082)
a7ffb66
zooba added a commit that referenced this pull request Oct 25, 2018
@zooba
bpo-31047: Fix ntpath.abspath to trim ending separator (GH-10082)
4aa1fda
@timgraham timgraham deleted the 31047 branch October 25, 2018 19:00
@zmwangx zmwangx mentioned this pull request Nov 3, 2018
Closed
@defnull defnull mentioned this pull request Dec 20, 2019
Closed
@mcarpenter mcarpenter mentioned this pull request Jan 23, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ned-deily ned-deily ned-deily requested changes

Assignees

@zooba zooba

Labels

OS-windows tests Tests in the Lib/test dir type-bug An unexpected behavior, bug, or error

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@timgraham @bedevere-bot @miss-islington @zooba @terryjreedy @ned-deily @the-knights-who-say-ni