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

[3.5] bpo-29478: Fix passing max_line_length=None from Compat32 policy #2025

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

Closed
wants to merge 1 commit into from
Closed

[3.5] bpo-29478: Fix passing max_line_length=None from Compat32 policy #2025

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
[3.5] bpo-29478: Fix passing max_line_length=None from Compat32 policy 
(cherry picked from commit 03a9c7a0d2a27e91b540f92f0f019ef47d3fce6a)
  • Loading branch information
@mircea-cosbuc @matrixise
mircea-cosbuc authored and matrixise committed Jun 9, 2017
commit 7451dd6b656929ef25baedf64a8176b448813c5f
8 changes: 6 additions & 2 deletions Lib/email/_policybase.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,8 +357,12 @@ def _fold(self, name, value, sanitize):
# Assume it is a Header-like object.
h = value
if h is not None:
parts.append(h.encode(linesep=self.linesep,
maxlinelen=self.max_line_length))
# The Header class interprets a value of None for maxlinelen as the
# default value of 78, as recommended by RFC 2822.
maxlinelen = 0
if self.max_line_length is not None:
maxlinelen = self.max_line_length
parts.append(h.encode(linesep=self.linesep, maxlinelen=maxlinelen))
parts.append(self.linesep)
return ''.join(parts)

Expand Down
7 changes: 7 additions & 0 deletions Lib/test/test_email/test_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,13 @@ def test_set_mangle_from_via_policy(self):
g.flatten(msg)
self.assertEqual(s.getvalue(), self.typ(expected))

def test_compat32_max_line_length_does_not_fold_when_none(self):
msg = self.msgmaker(self.typ(self.refold_long_expected[0]))
s = self.ioclass()
g = self.genclass(s, policy=policy.compat32.clone(max_line_length=None))
g.flatten(msg)
self.assertEqual(s.getvalue(), self.typ(self.refold_long_expected[0]))


class TestGenerator(TestGeneratorBase, TestEmailBase):

Expand Down
0