Skip to content

[2.7] bpo-30806: Fix netrc.__repr__() format (GH-2491) #4276

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
Merged
methane merged 3 commits into from
Dec 10, 2017
Merged

[2.7] bpo-30806: Fix netrc.__repr__() format (GH-2491) #4276

methane merged 3 commits into from
Dec 10, 2017

Conversation

@sloria
Copy link

@sloria sloria commented Nov 4, 2017 •
edited by bedevere-bot
Loading

Backports the fix for https://bugs.python.org/issue30806 and updates the syntax for Python 2.7 compatibility.

https://bugs.python.org/issue30806

@sloria sloria mentioned this pull request Nov 4, 2017
Merged
@sloria sloria force-pushed the backport-bpo-30806-fix branch from 8e6e688 to 247057d Compare November 4, 2017 17:21
@methane methane changed the title [2.7] bpo-30806 netrc.__repr__() is broken for writing to file (GH-2491) [2.7] bpo-30806: Fix netrc.__repr__() format (GH-2491) Nov 6, 2017
@methane
Copy link
Member

methane commented Nov 6, 2017

test is failing on Windows.

@sloria
Copy link
Author

sloria commented Nov 6, 2017

@methane Yeah, I saw that, but I'm not quite sure why it's happening. All I did was cherry-pick the fix and the test from #2491. Any help would be appreciated.

@methane
Copy link
Member

methane commented Nov 7, 2017

Yes, that's why I don't want to backport it by myself. Backporting to 2.7 requires significant efforts.
Python 2.7 and 3 are different. netrc in 2.7 and 3 are different too. Just cherry-pick is not enough.

I don't have time and motivation about thinking about how to backport it. I'm very busy in these
months, sorry.

methane
methane reviewed Nov 7, 2017
View reviewed changes
Lib/test/test_netrc.py Outdated
Copy link
Member

@methane methane Nov 7, 2017

Choose a reason for hiding this comment

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

Maybe, reverting this change may fix the error.

Copy link
Member

@methane methane Nov 7, 2017

Choose a reason for hiding this comment

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

Don't forget to remove import tempfile when reverting this.

@sloria
Copy link
Author

sloria commented Nov 7, 2017 •
edited
Loading

@methane I understand. No worries; I'm also busier than usual these days, but I'll take a look at those Windows tests when I have time.

@sloria
Use str.format instead of f-strings for 2.7 compat
8efd823 
Also, make the tests work in 2.7
@sloria sloria force-pushed the backport-bpo-30806-fix branch from 247057d to 72d9096 Compare December 9, 2017 17:11
@sloria sloria force-pushed the backport-bpo-30806-fix branch from 72d9096 to 40b0005 Compare December 9, 2017 17:41
@sloria
Copy link
Author

sloria commented Dec 9, 2017

@methane Thanks for the tip with the tests. All green now!

@methane methane merged commit 3b9173d into python:2.7 Dec 10, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@methane methane methane left review comments

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

@sloria @methane @the-knights-who-say-ni @bedevere-bot @Bezier89