mirrors/cpython
0
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2024-11-23 18:04:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Issue #16473: Merge codecs doc and test from 3.4 into 3.5

Browse Source
This commit is contained in:
Martin Panter 2015-09-12 01:22:17 +00:00
commit 9ab96946ee
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Doc/library/codecs.rst
View File

@ -1310,9 +1310,9 @@ to :class:`bytes` mappings. They are not supported by :meth:`bytes.decode`
+----------------------+------------------+------------------------------+------------------------------+
| Codec | Aliases | Purpose | Encoder / decoder |
+======================+==================+==============================+==============================+
| base64_codec [#b64]_ | base64, base_64 | Convert operand to MIME | :meth:`base64.b64encode` / |
| | | base64 (the result always | :meth:`base64.b64decode` |
| | | includes a trailing | |
| base64_codec [#b64]_ | base64, base_64 | Convert operand to multiline | :meth:`base64.encodebytes` / |
| | | MIME base64 (the result | :meth:`base64.decodebytes` |
| | | always includes a trailing | |
| | | ``'\n'``) | |
| | | | |
| | | .. versionchanged:: 3.4 | |
@ -1324,14 +1324,14 @@ to :class:`bytes` mappings. They are not supported by :meth:`bytes.decode`
| bz2_codec | bz2 | Compress the operand | :meth:`bz2.compress` / |
| | | using bz2 | :meth:`bz2.decompress` |
+----------------------+------------------+------------------------------+------------------------------+
| hex_codec | hex | Convert operand to | :meth:`base64.b16encode` / |
| | | hexadecimal | :meth:`base64.b16decode` |
| hex_codec | hex | Convert operand to | :meth:`binascii.b2a_hex` / |
| | | hexadecimal | :meth:`binascii.a2b_hex` |
| | | representation, with two | |
| | | digits per byte | |
+----------------------+------------------+------------------------------+------------------------------+
| quopri_codec | quopri, | Convert operand to MIME | :meth:`quopri.encodestring` /|
| | quotedprintable, | quoted printable | :meth:`quopri.decodestring` |
| | quoted_printable | | |
| quopri_codec | quopri, | Convert operand to MIME | :meth:`quopri.encode` with |
| | quotedprintable, | quoted printable | ``quotetabs=True`` / |
| | quoted_printable | | :meth:`quopri.decode` |
+----------------------+------------------+------------------------------+------------------------------+
| uu_codec | uu | Convert the operand using | :meth:`uu.encode` / |
| | | uuencode | :meth:`uu.decode` |

2
Lib/encodings/quopri_codec.py
View File

@ -11,7 +11,7 @@ def quopri_encode(input, errors='strict'):
assert errors == 'strict'
f = BytesIO(input)
g = BytesIO()
quopri.encode(f, g, 1)
quopri.encode(f, g, quotetabs=True)
return (g.getvalue(), len(input))
def quopri_decode(input, errors='strict'):

8
Lib/test/test_codecs.py
View File

@ -2684,6 +2684,14 @@ class TransformCodecTest(unittest.TestCase):
info = codecs.lookup(alias)
self.assertEqual(info.name, expected_name)
def test_quopri_stateless(self):
# Should encode with quotetabs=True
encoded = codecs.encode(b"space tab\teol \n", "quopri-codec")
self.assertEqual(encoded, b"space=20tab=09eol=20\n")
# But should still support unescaped tabs and spaces
unescaped = b"space tab eol\n"
self.assertEqual(codecs.decode(unescaped, "quopri-codec"), unescaped)
def test_uu_invalid(self):
# Missing "begin" line
self.assertRaises(ValueError, codecs.decode, b"", "uu-codec")