Changeset 391 for python/trunk/Lib/rfc822.py

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Lib/rfc822.py (modified) (2 diffs)

python/trunk/Lib/rfc822.py

@@ -35 +35 @@
 lseek() system call doesn't work.  For maximum portability, you should set the
 seekable argument to zero to prevent that initial \code{tell} when passing in
-an unseekable object such as a a file object created from a socket object.  If
+an unseekable object such as a file object created from a socket object.  If
 it is 1 on entry -- which it is by default -- the tell() method of the open
 file object is called once; if this raises an exception, seekable is reset to
@@ -213 +213 @@
         rules, e.g. to strip trailing whitespace, or to recognize MH template
         separators ('--------').  For convenience (e.g. for code reading from
-        sockets) a line consisting of \r\n also matches.
+        sockets) a line consisting of \\r\\n also matches.
         """
         return line in _blanklines