mirror of
https://github.com/python/cpython.git
synced 2025-08-03 16:39:00 +00:00
merge from 3.4
issue15588 - Correct the quopri module documentation. Mention the correct types of the parameters on encodestring and decodestring. Patch by Petri Lehtinen.
This commit is contained in:
commit
b057970f0d
2 changed files with 22 additions and 24 deletions
|
@ -44,13 +44,11 @@ def quote(c):
|
|||
def encode(input, output, quotetabs, header=False):
|
||||
"""Read 'input', apply quoted-printable encoding, and write to 'output'.
|
||||
|
||||
'input' and 'output' are files with readline() and write() methods.
|
||||
The 'quotetabs' flag indicates whether embedded tabs and spaces should be
|
||||
quoted. Note that line-ending tabs and spaces are always encoded, as per
|
||||
RFC 1521.
|
||||
The 'header' flag indicates whether we are encoding spaces as _ as per
|
||||
RFC 1522.
|
||||
"""
|
||||
'input' and 'output' are binary file objects. The 'quotetabs' flag
|
||||
indicates whether embedded tabs and spaces should be quoted. Note that
|
||||
line-ending tabs and spaces are always encoded, as per RFC 1521.
|
||||
The 'header' flag indicates whether we are encoding spaces as _ as per RFC
|
||||
1522."""
|
||||
|
||||
if b2a_qp is not None:
|
||||
data = input.read()
|
||||
|
@ -118,7 +116,7 @@ def encodestring(s, quotetabs=False, header=False):
|
|||
|
||||
def decode(input, output, header=False):
|
||||
"""Read 'input', apply quoted-printable decoding, and write to 'output'.
|
||||
'input' and 'output' are files with readline() and write() methods.
|
||||
'input' and 'output' are binary file objects.
|
||||
If 'header' is true, decode underscore as space (per RFC 1522)."""
|
||||
|
||||
if a2b_qp is not None:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue