[proxy] github.com — ← back | site home | direct (HTTPS) ↗ | proxy home | ◑ dark◐ light
/ cpython Public

Conversation

Copy link
Member

pablogsal commented Nov 7, 2018 •
edited
Loading

Copy link
Member Author

pablogsal commented Nov 7, 2018

CC @samstagern @eryksun @vsajip

pablogsal requested review from vsajip and vstinner November 7, 2018 23:01
vstinner approved these changes Nov 7, 2018
View reviewed changes
Copy link
Member

vstinner left a comment

Choose a reason for hiding this comment

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

LGTM. I'm always in favor of reverting changes which break the CI :-)

Copy link
Member

vstinner commented Nov 7, 2018

If your buildbot-custom branch change is this PR, it failed on: https://buildbot.python.org/all/#builders/42/builds/5

pablogsal merged commit 6843ffe into python:master Nov 7, 2018
Copy link
Contributor

miss-islington commented Nov 7, 2018

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

pablogsal deleted the revert-9b6adac branch November 7, 2018 23:55
Copy link

bedevere-bot commented Nov 7, 2018

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

Copy link
Contributor

miss-islington commented Nov 7, 2018

Sorry, @pablogsal, I could not cleanly backport this to 3.6 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 6843ffe4533e9f2cde036296fd932fef6f059687 3.6

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Nov 7, 2018
Revert "bpo-32409: Fix regression in activate.bat on international Wi…
b655bbb 
…ndows (pythonGH-10295)" (pythonGH-10403)

This reverts commit c64583b due to multiple buildbot failures when building it.
(cherry picked from commit 6843ffe)

Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>
Copy link
Member Author

pablogsal commented Nov 7, 2018 •
edited
Loading

@vstinner

If your buildbot-custom branch change is this PR, it failed on: https://buildbot.python.org/all/#builders/42/builds/5

No, that is basically the same error that this PR is fixing but with extra printing to see what exactly was failing in the original PR. Check the diff here:

67ef3de

Copy link
Member Author

pablogsal commented Nov 8, 2018

The commit was not backported to 3.6, so is no need to backport this to 3.6. :)

Good job @miss-islington !

miss-islington added a commit that referenced this pull request Nov 8, 2018
Revert "bpo-32409: Fix regression in activate.bat on international Wi…
3ba5e25 
…ndows (GH-10295)" (GH-10403)

This reverts commit c64583b due to multiple buildbot failures when building it.
(cherry picked from commit 6843ffe)

Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>
pablogsal mentioned this pull request Nov 8, 2018
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

vstinner vstinner approved these changes

vsajip Awaiting requested review from vsajip

Assignees

pablogsal

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants