Skip to content

bpo-43125: Fix: return expected type (str), not original value (bytes) in email/base64mime.py::body_encode #24476

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

Merged
corona10 merged 5 commits into from
Mar 30, 2021
Merged

bpo-43125: Fix: return expected type (str), not original value (bytes) in email/base64mime.py::body_encode #24476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e5d3bae
Fix: return expected type (str), not original value
Feb 7, 2021
8ebf339
Fix: adapt test for fix of bpo-43125
Feb 7, 2021
adfd979
📜🤖 Added by blurb_it.
blurb-it[bot] Feb 7, 2021
54b3460
suggested changes
Feb 22, 2021
0ff632f
Not needed
Mar 8, 2021
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
2 changes: 1 addition & 1 deletion Lib/email/base64mime.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ def body_encode(s, maxlinelen=76, eol=NL):
in an email.
"""
if not s:
return s
return ""

encvec = []
max_unencoded = maxlinelen * 3 // 4
Expand Down
3 changes: 1 addition & 2 deletions Lib/test/test_email/test_email.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4261,7 +4261,7 @@ def test_decode(self):

def test_encode(self):
eq = self.assertEqual
eq(base64mime.body_encode(b''), b'')
eq(base64mime.body_encode(b''), '')
eq(base64mime.body_encode(b'hello'), 'aGVsbG8=\n')
# Test the binary flag
eq(base64mime.body_encode(b'hello\n'), 'aGVsbG8K\n')
Expand Down Expand Up @@ -4292,7 +4292,6 @@ def test_header_encode(self):
eq(he('hello\nworld'), '=?iso-8859-1?b?aGVsbG8Kd29ybGQ=?=')



class TestQuopri(unittest.TestCase):
def setUp(self):
# Set of characters (as byte integers) that don't need to be encoded
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2021-02-07-19-13-30.bpo-43125.AqNoMa.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Return empty string if base64mime.body_encode receive empty bytes