Merged revisions 73952 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

(Only docstrings were modified, won't backport to 3.1)

........
  r73952 | amaury.forgeotdarc | 2009-07-11 16:33:51 +0200 (sam., 11 juil. 2009) | 4 lines

  #2622 Import errors in email.message, from a py2app standalone application.

  Patch by Mads Kiilerich, Reviewed by Barry Warsaw.
........
This commit is contained in:
Amaury Forgeot d'Arc 2009-07-12 16:43:19 +00:00
parent c9e6cecdce
commit 1c25de69ee
5 changed files with 9 additions and 9 deletions

View File

@ -20,7 +20,7 @@ in To:, From:, Cc:, etc. fields, as well as Subject: lines.
This module does not do the line wrapping or end-of-line character conversion This module does not do the line wrapping or end-of-line character conversion
necessary for proper internationalized headers; it only does dumb encoding and necessary for proper internationalized headers; it only does dumb encoding and
decoding. To deal with the various line wrapping issues, use the email.Header decoding. To deal with the various line wrapping issues, use the email.header
module. module.
""" """
@ -104,7 +104,7 @@ def decode(string):
This function does not parse a full MIME header value encoded with This function does not parse a full MIME header value encoded with
base64 (like =?iso-8895-1?b?bmloISBuaWgh?=) -- please use the high base64 (like =?iso-8895-1?b?bmloISBuaWgh?=) -- please use the high
level email.Header class for that functionality. level email.header class for that functionality.
""" """
if not string: if not string:
return bytes() return bytes()

View File

@ -61,7 +61,7 @@ def decode_header(header):
otherwise a lower-case string containing the name of the character set otherwise a lower-case string containing the name of the character set
specified in the encoded string. specified in the encoded string.
An email.Errors.HeaderParseError may be raised when certain decoding error An email.errors.HeaderParseError may be raised when certain decoding error
occurs (e.g. a base64 decoding exception). occurs (e.g. a base64 decoding exception).
""" """
# If no encoding, just return the header with no charset. # If no encoding, just return the header with no charset.

View File

@ -11,7 +11,7 @@ character set, but that includes some 8-bit characters that are normally not
allowed in email bodies or headers. allowed in email bodies or headers.
Quoted-printable is very space-inefficient for encoding binary files; use the Quoted-printable is very space-inefficient for encoding binary files; use the
email.base64MIME module for that instead. email.base64mime module for that instead.
This module provides an interface to encode and decode both headers and bodies This module provides an interface to encode and decode both headers and bodies
with quoted-printable encoding. with quoted-printable encoding.
@ -23,7 +23,7 @@ in To:/From:/Cc: etc. fields, as well as Subject: lines.
This module does not do the line wrapping or end-of-line character This module does not do the line wrapping or end-of-line character
conversion necessary for proper internationalized headers; it only conversion necessary for proper internationalized headers; it only
does dumb encoding and decoding. To deal with the various line does dumb encoding and decoding. To deal with the various line
wrapping issues, use the email.Header module. wrapping issues, use the email.header module.
""" """
__all__ = [ __all__ = [
@ -291,7 +291,7 @@ def header_decode(s):
This function does not parse a full MIME header value encoded with This function does not parse a full MIME header value encoded with
quoted-printable (like =?iso-8895-1?q?Hello_World?=) -- please use quoted-printable (like =?iso-8895-1?q?Hello_World?=) -- please use
the high level email.Header class for that functionality. the high level email.header class for that functionality.
""" """
s = s.replace('_', ' ') s = s.replace('_', ' ')
return re.sub(r'=\w{2}', _unquote_match, s, re.ASCII) return re.sub(r'=\w{2}', _unquote_match, s, re.ASCII)

View File

@ -17,7 +17,7 @@ from test.support import TestSkipped
import email import email
from email import __file__ as testfile from email import __file__ as testfile
from email.Iterators import _structure from email.iterators import _structure
def openfile(filename): def openfile(filename):
from os.path import join, dirname, abspath from os.path import join, dirname, abspath

View File

@ -1,6 +1,6 @@
"""Manage HTTP Response Headers """Manage HTTP Response Headers
Much of this module is red-handedly pilfered from email.Message in the stdlib, Much of this module is red-handedly pilfered from email.message in the stdlib,
so portions are Copyright (C) 2001,2002 Python Software Foundation, and were so portions are Copyright (C) 2001,2002 Python Software Foundation, and were
written by Barry Warsaw. written by Barry Warsaw.
""" """
@ -184,7 +184,7 @@ class Headers:
h.add_header('content-disposition', 'attachment', filename='bud.gif') h.add_header('content-disposition', 'attachment', filename='bud.gif')
Note that unlike the corresponding 'email.Message' method, this does Note that unlike the corresponding 'email.message' method, this does
*not* handle '(charset, language, value)' tuples: all values must be *not* handle '(charset, language, value)' tuples: all values must be
strings or None. strings or None.
""" """