[Python-checkins] r73952 - in python/trunk: Lib/email/base64mime.py Lib/email/header.py Lib/email/message.py Lib/email/quoprimime.py Lib/email/test/test_email_codecs.py Lib/email/test/test_email_torture.py Lib/test/test_old_mailbox.py Lib/wsgiref/headers.py Misc/NEWS
amaury.forgeotdarc
python-checkins at python.org
Sat Jul 11 16:33:51 CEST 2009
Author: amaury.forgeotdarc
Date: Sat Jul 11 16:33:51 2009
New Revision: 73952
Log:
#2622 Import errors in email.message, from a py2app standalone application.
Patch by Mads Kiilerich, Reviewed by Barry Warsaw.
Modified:
python/trunk/Lib/email/base64mime.py
python/trunk/Lib/email/header.py
python/trunk/Lib/email/message.py
python/trunk/Lib/email/quoprimime.py
python/trunk/Lib/email/test/test_email_codecs.py
python/trunk/Lib/email/test/test_email_torture.py
python/trunk/Lib/test/test_old_mailbox.py
python/trunk/Lib/wsgiref/headers.py
python/trunk/Misc/NEWS
Modified: python/trunk/Lib/email/base64mime.py
==============================================================================
--- python/trunk/Lib/email/base64mime.py (original)
+++ python/trunk/Lib/email/base64mime.py Sat Jul 11 16:33:51 2009
@@ -20,7 +20,7 @@
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
-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.
"""
@@ -167,7 +167,7 @@
This function does not parse a full MIME header value encoded with
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 s:
return s
Modified: python/trunk/Lib/email/header.py
==============================================================================
--- python/trunk/Lib/email/header.py (original)
+++ python/trunk/Lib/email/header.py Sat Jul 11 16:33:51 2009
@@ -62,7 +62,7 @@
header, otherwise a lower-case string containing the name of the character
set 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).
"""
# If no encoding, just return the header
@@ -337,8 +337,8 @@
# different charsets and/or encodings, and the resulting header will
# accurately reflect each setting.
#
- # Each encoding can be email.Utils.QP (quoted-printable, for
- # ASCII-like character sets like iso-8859-1), email.Utils.BASE64
+ # Each encoding can be email.utils.QP (quoted-printable, for
+ # ASCII-like character sets like iso-8859-1), email.utils.BASE64
# (Base64, for non-ASCII like character sets like KOI8-R and
# iso-2022-jp), or None (no encoding).
#
Modified: python/trunk/Lib/email/message.py
==============================================================================
--- python/trunk/Lib/email/message.py (original)
+++ python/trunk/Lib/email/message.py Sat Jul 11 16:33:51 2009
@@ -129,7 +129,7 @@
"From ". For more flexibility, use the flatten() method of a
Generator instance.
"""
- from email.Generator import Generator
+ from email.generator import Generator
fp = StringIO()
g = Generator(fp)
g.flatten(self, unixfrom=unixfrom)
@@ -787,4 +787,4 @@
return [part.get_content_charset(failobj) for part in self.walk()]
# I.e. def walk(self): ...
- from email.Iterators import walk
+ from email.iterators import walk
Modified: python/trunk/Lib/email/quoprimime.py
==============================================================================
--- python/trunk/Lib/email/quoprimime.py (original)
+++ python/trunk/Lib/email/quoprimime.py Sat Jul 11 16:33:51 2009
@@ -11,7 +11,7 @@
allowed in email bodies or headers.
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
with quoted-printable encoding.
@@ -23,7 +23,7 @@
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 decoding. To deal with the various line
-wrapping issues, use the email.Header module.
+wrapping issues, use the email.header module.
"""
__all__ = [
@@ -330,7 +330,7 @@
This function does not parse a full MIME header value encoded with
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('_', ' ')
return re.sub(r'=\w{2}', _unquote_match, s)
Modified: python/trunk/Lib/email/test/test_email_codecs.py
==============================================================================
--- python/trunk/Lib/email/test/test_email_codecs.py (original)
+++ python/trunk/Lib/email/test/test_email_codecs.py Sat Jul 11 16:33:51 2009
@@ -6,9 +6,9 @@
from test.test_support import run_unittest
from email.test.test_email import TestEmailBase
-from email.Charset import Charset
-from email.Header import Header, decode_header
-from email.Message import Message
+from email.charset import Charset
+from email.header import Header, decode_header
+from email.message import Message
# We're compatible with Python 2.3, but it doesn't have the built-in Asian
# codecs, so we have to skip all these tests.
Modified: python/trunk/Lib/email/test/test_email_torture.py
==============================================================================
--- python/trunk/Lib/email/test/test_email_torture.py (original)
+++ python/trunk/Lib/email/test/test_email_torture.py Sat Jul 11 16:33:51 2009
@@ -17,7 +17,7 @@
import email
from email import __file__ as testfile
-from email.Iterators import _structure
+from email.iterators import _structure
def openfile(filename):
from os.path import join, dirname, abspath
Modified: python/trunk/Lib/test/test_old_mailbox.py
==============================================================================
--- python/trunk/Lib/test/test_old_mailbox.py (original)
+++ python/trunk/Lib/test/test_old_mailbox.py Sat Jul 11 16:33:51 2009
@@ -99,11 +99,11 @@
def test_unix_mbox(self):
### should be better!
- import email.Parser
+ import email.parser
fname = self.createMessage("cur", True)
n = 0
for msg in mailbox.PortableUnixMailbox(open(fname),
- email.Parser.Parser().parse):
+ email.parser.Parser().parse):
n += 1
self.assertEqual(msg["subject"], "Simple Test")
self.assertEqual(len(str(msg)), len(FROM_)+len(DUMMY_MESSAGE))
Modified: python/trunk/Lib/wsgiref/headers.py
==============================================================================
--- python/trunk/Lib/wsgiref/headers.py (original)
+++ python/trunk/Lib/wsgiref/headers.py Sat Jul 11 16:33:51 2009
@@ -1,6 +1,6 @@
"""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
written by Barry Warsaw.
"""
@@ -174,7 +174,7 @@
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
strings or None.
"""
Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS (original)
+++ python/trunk/Misc/NEWS Sat Jul 11 16:33:51 2009
@@ -350,6 +350,9 @@
Library
-------
+- Issue #2622: Fixed an ImportError when importing email.messsage from a
+ standalone application built with py2exe or py2app.
+
- Issue #6459: distutils.command.build_ext.get_export_symbols now uses the
"PyInit" prefix, rather than "init".
More information about the Python-checkins
mailing list