From: Barry Warsaw <barry@python.org>
Date: Sun, 2 Jun 2002 19:05:51 +0000 (+0000)
Subject: Use absolute import paths for intrapackage imports.
X-Git-Tag: v2.3c1~5508
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8ba76e8929058634ee55bea8781e32715b0ce5c2;p=thirdparty%2FPython%2Fcpython.git

Use absolute import paths for intrapackage imports.

as_string(): Use Generator.flatten() for better performance.
---

diff --git a/Lib/email/Message.py b/Lib/email/Message.py
index 84a4e16cc960..491c259920b9 100644
--- a/Lib/email/Message.py
+++ b/Lib/email/Message.py
@@ -10,9 +10,9 @@ from cStringIO import StringIO
 from types import ListType, StringType
 
 # Intrapackage imports
-import Errors
-import Utils
-import Charset
+from email import Errors
+from email import Utils
+from email import Charset
 
 SEMISPACE = '; '
 
@@ -78,10 +78,10 @@ class Message:
         Optional `unixfrom' when true, means include the Unix From_ envelope
         header.
         """
-        from Generator import Generator
+        from email.Generator import Generator
         fp = StringIO()
         g = Generator(fp)
-        g(self, unixfrom=unixfrom)
+        g.flatten(self, unixfrom=unixfrom)
         return fp.getvalue()
 
     def is_multipart(self):