diff options
| author | Grégory Starck <g.starck@gmail.com> | 2021-03-30 08:37:37 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-30 08:37:37 (GMT) |
| commit | cf35e05f89bb008d6f4553f9875e0fe87fc02406 (patch) | |
| tree | 9fe5a87f0acdd3683fe6e3da7fafb5d8383568a5 | |
| parent | dfeec347f21b86879ba8f27f567bb275b243f1bc (diff) | |
| download | cpython-cf35e05f89bb008d6f4553f9875e0fe87fc02406.zip cpython-cf35e05f89bb008d6f4553f9875e0fe87fc02406.tar.gz cpython-cf35e05f89bb008d6f4553f9875e0fe87fc02406.tar.bz2 | |
bpo-43125: Fix: return expected type (str), not original value (bytes) in email/base64mime.py::body_encode (GH-24476)
| -rw-r--r-- | Lib/email/base64mime.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_email/test_email.py | 3 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2021-02-07-19-13-30.bpo-43125.AqNoMa.rst | 1 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Lib/email/base64mime.py b/Lib/email/base64mime.py index 17f0818..a7cc373 100644 --- a/Lib/email/base64mime.py +++ b/Lib/email/base64mime.py @@ -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 diff --git a/Lib/test/test_email/test_email.py b/Lib/test/test_email/test_email.py index 044b938..720a63b 100644 --- a/Lib/test/test_email/test_email.py +++ b/Lib/test/test_email/test_email.py @@ -4261,7 +4261,7 @@ class TestBase64(unittest.TestCase): 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') @@ -4292,7 +4292,6 @@ eHh4eCB4eHh4IA==\r 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 diff --git a/Misc/NEWS.d/next/Library/2021-02-07-19-13-30.bpo-43125.AqNoMa.rst b/Misc/NEWS.d/next/Library/2021-02-07-19-13-30.bpo-43125.AqNoMa.rst new file mode 100644 index 0000000..4c4a583 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2021-02-07-19-13-30.bpo-43125.AqNoMa.rst @@ -0,0 +1 @@ +Return empty string if base64mime.body_encode receive empty bytes |