8000 [email] bpo-29478: Fix passing max_line_length=None from Compat32 policy by mircea-cosbuc · Pull Request #595 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

[email] bpo-29478: Fix passing max_line_length=None from Compat32 policy #595

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
merged 3 commits into from
Jun 12, 2017
Merged

[email] bpo-29478: Fix passing max_line_length=None from Compat32 policy #595

merged 3 commits into from
Jun 12, 2017

Conversation

mircea-cosbuc
Copy link
Contributor

This fixes an issue with the Compat32 email policy where setting the max_line_length attribute to None should prevent line wrapping as specified in the docs.

@the-knights-who-say-ni
Copy link

Hello, and thanks for your contribution!

I'm a bot set up to make sure that the project can legally accept your contribution by verifying you have signed the PSF contributor agreement (CLA).

Unfortunately our records indicate you have not signed the CLA. For legal reasons we need you to sign this before we can look at your contribution. Please follow these steps to rectify the issue:

  1. Sign the PSF contributor agreement. The "bugs.python.org username" requested by the form is the "Login name" field in "Your Details" at b.p.o
  2. Wait at least one US business day and then check the "Contributor form received entry under "Your Details" on bugs.python.org to see if your account has been marked as having signed the CLA (the delay is due to a person having to manually check your signed CLA)
  3. Reply here saying you have completed the above steps

Thanks again to your contribution and we look forward to looking at it!

@mention-bot
Copy link

@mircea-cosbuc, thanks for your PR! By analyzing the history of the files in this pull request, we identified @bitdancer and @rhettinger to be potential reviewers.

@vstinner vstinner changed the title bpo-29478: Fix passing max_line_length=None from Compat32 policy [email] bpo-29478: Fix passing max_line_length=None from Compat32 policy Mar 10, 2017
@bitdancer
Copy link
Member

See the issue for a comment (you should add yourself to nosy there).

@mircea-cosbuc
Copy link
Contributor Author
8000

Thank you for the feedback. I've completed the CLA signing steps.

@mircea-cosbuc mircea-cosbuc reopened this Apr 11, 2017
This was referenced Jun 9, 2017
Closed
Closed
@matrixise
Copy link
Member

@Mariatta and @bitdancer because there are 2 approvals for this PR, I just back ported the code to 3.5 and 3.6.

@Mariatta
Copy link
Member
Mariatta commented Jun 9, 2017

Thanks for the backport PR @matrixise

We still need an entry in Misc/NEWS and @mircea-cosbuc should add themselves to Misc/ACKS
@mircea-cosbuc can you make the change?

Thanks.

@matrixise
Copy link
Member

@Mariatta once the PR will be completed with the Misc/NEWS I will make the backports for 3.5 and 3.6. Just keep me informed.

@mircea-cosbuc
Copy link
Contributor Author

@Mariatta Thanks! I've updated ACKS

@matrixise
Copy link
Member

@mircea-cosbuc don't forget the Misc/NEWS file. plz

@mircea-cosbuc
Copy link
Contributor Author

@matrixise I've updated the Misc/NEWS file, but I seem to be getting a merge conflict on it.

bitdancer
bitdancer previously requested changes Jun 10, 2017
View reviewed changes
Misc/NEWS Outdated
@@ -14,6 +14,8 @@ Core and Builtins

- bpo-29546: Set the 'path' and 'name' attribute on ImportError for ``from ... import ...``.

- bpo-29478: Fix passing max_line_length=None from Compat32 policy
Copy link
Member

Choose a reason for hiding this comment

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

I think it would be clearer to say "If max_line_length=None is specified while using the Compat32 policy, it is no longer ignored".

Mariatta
Mariatta reviewed Jun 12, 2017
View reviewed changes
Misc/NEWS Outdated
@@ -14,6 +14,9 @@ Core and Builtins

- bpo-29546: Set the 'path' and 'name' attribute on ImportError for ``from ... import ...``.

- bpo-29478: If max_line_length=None is specified while using the Compat32 policy,
it is no longer ignored
Copy link
Member

Choose a reason for hiding this comment

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

Missing a period at the end of the sentence:
Should be:

it is no longer ignored.  Patch by Mircea Cosbuc.

@Mariatta
Copy link
Member

@mircea-cosbuc Can you rebase to resolve the conflict?

eg. in your bpo-29478 branch, and assuming that you have an upstream remote for python/cpython:

git fetch upstream
git rebase upstream/master

It will show that there's a merge conflict with Misc/NEWS file.

There's some info on how to address merge conflict here: https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/

@mircea-cosbuc
Copy link
Contributor Author

@Mariatta @bitdancer Sorry for the delay, I've updated the NEWS description and rebased my branch.

@Mariatta
Copy link
Member

Thanks :) Will merge once Travis passed.

8000

@Mariatta Mariatta dismissed bitdancer’s stale review June 12, 2017 06:41

The requested change has been made.

@Mariatta Mariatta merged commit b459f74 into python:master Jun 12, 2017
@Mariatta
Copy link
Member

Thanks @mircea-cosbuc and congrats on your first contribution to CPython 🎉

@matrixise
Copy link
Member

@Mariatta can I backport it to 3.5 and 3.6 ?

@Mariatta
Copy link
Member

@matrixise Sure. Please use the commit hash b459f7482612d340b88b62edc024628595ec6337 for the cherry-pick. Thanks.
6D40

Mariatta pushed a commit to Mariatta/cpython that referenced this pull request Jun 16, 2017
@mircea-cosbuc @Mariatta
[3.6] [email] bpo-29478: Fix passing max_line_length=None from Compat…
e383aa6 
…32 policy (pythonGH-595)

If max_line_length=None is specified while using the Compat32 policy,
it is no longer ignored..
(cherry picked from commit b459f74)
@Mariatta Mariatta mentioned this pull request Jun 16, 2017
Merged
Mariatta pushed a commit to Mariatta/cpython that referenced this pull request Jun 16, 2017
@mircea-cosbuc @Mariatta
[3.5] [email] bpo-29478: Fix passing max_line_length=None from Compat…
21a87cf 
…32 policy (pythonGH-595)

If max_line_length=None is specified while using the Compat32 policy,
it is no longer ignored..
(cherry picked from commit b459f74)
@Mariatta Mariatta mentioned this pull request Jun 16, 2017
Merged
Mariatta added a commit that referenced this pull request Jun 16, 2017
@Mariatta
[email] bpo-29478: Fix passing max_line_length=None from Compat32 pol…
820b714 
…icy (GH-595) (GH-2234)

If max_line_length=None is specified while using the Compat32 policy,
it is no longer ignored..
(cherry picked from commit b459f74)
Mariatta added a commit that referenced this pull request Jun 16, 2017
@Mariatta
[email] bpo-29478: Fix passing max_line_length=None from Compat32 pol…
e9f4d8d 
…icy (GH-595) (GH-2233)

If max_line_length=None is specified while using the Compat32 policy,
it is no longer ignored..
(cherry picked from commit b459f74)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mariatta Mariatta Mariatta approved these changes

@bitdancer bitdancer bitdancer 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.
6 participants
@mircea-cosbuc @the-knights-who-say-ni @mention-bot @bitdancer @matrixise @Mariatta
0