From: R. David Murray <rdmurray@bitdance.com>
Date: Mon, 6 Dec 2010 18:48:31 +0000 (+0000)
Subject: Merged revisions 85146 via svnmerge from
X-Git-Tag: v2.7.2rc1~503
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=82e7aaee56b511dfbb7c2689eadd131eebd27914;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 85146 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85146 | r.david.murray | 2010-10-01 16:38:33 -0400 (Fri, 01 Oct 2010) | 3 lines

  Fix docstring typo.
........
---

diff --git a/Lib/email/generator.py b/Lib/email/generator.py
index ce9c36bbdb7a..fa45dcb7ea77 100644
--- a/Lib/email/generator.py
+++ b/Lib/email/generator.py
@@ -292,7 +292,7 @@ class Generator:
 _FMT = '[Non-text (%(type)s) part of message omitted, filename %(filename)s]'
 
 class DecodedGenerator(Generator):
-    """Generator a text representation of a message.
+    """Generates a text representation of a message.
 
     Like the Generator base class, except that non-text parts are substituted
     with a format string representing the part.