changeset: 79083:7a125913a375
branch: 2.7
parent: 79080:53fa224b95f4
user: Ezio Melotti <ezio.melotti@gmail.com>
date: Fri Sep 21 16:27:45 2012 +0300
files: Lib/_LWPCookieJar.py Lib/email/base64mime.py Lib/email/utils.py Lib/rfc822.py
description:
#15980: properly escape newlines in docstrings. Patch by Serhiy Storchaka.
diff -r 53fa224b95f4 -r 7a125913a375 Lib/_LWPCookieJar.py
--- a/Lib/_LWPCookieJar.py	Fri Sep 21 13:51:40 2012 +0200
+++ b/Lib/_LWPCookieJar.py	Fri Sep 21 16:27:45 2012 +0300
@@ -48,7 +48,7 @@
 
 class LWPCookieJar(FileCookieJar):
 """
- The LWPCookieJar saves a sequence of"Set-Cookie3" lines.
+ The LWPCookieJar saves a sequence of "Set-Cookie3" lines.
 "Set-Cookie3" is the format used by the libwww-perl libary, not known
 to be compatible with any browser, but which is easy to read and
 doesn't lose information about RFC 2965 cookies.
@@ -60,7 +60,7 @@
 """
 
 def as_lwp_str(self, ignore_discard=True, ignore_expires=True):
- """Return cookies as a string of "\n"-separated "Set-Cookie3" headers.
+ """Return cookies as a string of "\\n"-separated "Set-Cookie3" headers.
 
 ignore_discard and ignore_expires: see docstring for FileCookieJar.save
 
diff -r 53fa224b95f4 -r 7a125913a375 Lib/email/base64mime.py
--- a/Lib/email/base64mime.py	Fri Sep 21 13:51:40 2012 +0200
+++ b/Lib/email/base64mime.py	Fri Sep 21 16:27:45 2012 +0300
@@ -130,7 +130,7 @@
 verbatim (this is the default).
 
 Each line of encoded text will end with eol, which defaults to "\\n". Set
- this to "\r\n" if you will be using the result of this function directly
+ this to "\\r\\n" if you will be using the result of this function directly
 in an email.
 """
 if not s:
diff -r 53fa224b95f4 -r 7a125913a375 Lib/email/utils.py
--- a/Lib/email/utils.py	Fri Sep 21 13:51:40 2012 +0200
+++ b/Lib/email/utils.py	Fri Sep 21 16:27:45 2012 +0300
@@ -63,7 +63,7 @@
 """Decodes a base64 string.
 
 This function is equivalent to base64.decodestring and it's retained only
- for backward compatibility. It used to remove the last \n of the decoded
+ for backward compatibility. It used to remove the last \\n of the decoded
 string, if it had any (see issue 7143).
 """
 if not s:
@@ -73,7 +73,7 @@
 
 
 def fix_eols(s):
- """Replace all line-ending characters with \r\n."""
+ """Replace all line-ending characters with \\r\\n."""
 # Fix newlines with no preceding carriage return
 s = re.sub(r'(?<!\r)\n', CRLF, s)
 # Fix carriage returns with no following newline
diff -r 53fa224b95f4 -r 7a125913a375 Lib/rfc822.py
--- a/Lib/rfc822.py	Fri Sep 21 13:51:40 2012 +0200
+++ b/Lib/rfc822.py	Fri Sep 21 16:27:45 2012 +0300
@@ -212,7 +212,7 @@
 You may override this method if your application wants to bend the
 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
 
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://hg.python.org/cpython/rev/7a125913a375">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://hg.python.org/cpython/rev/7a125913a375" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>