From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Mon, 4 Jul 2011 00:09:44 +0000 (+0200)
Subject: (merge 3.2) Issue #12451: pydoc: importfile() now opens the Python script in
X-Git-Tag: v3.3.0a1~1971
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5f9a995ad7cf5d1ec7ceb25c4de66a2f1d491ee4;p=thirdparty%2FPython%2Fcpython.git

(merge 3.2) Issue #12451: pydoc: importfile() now opens the Python script in
binary mode, instead of text mode using the locale encoding, to avoid encoding
issues.
---

5f9a995ad7cf5d1ec7ceb25c4de66a2f1d491ee4
diff --cc Misc/NEWS
index d2c5a0310939,5d4ed6fe4444..9aba95e98f2a
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -209,13 -58,6 +209,16 @@@ Core and Builtin
  Library
  -------
  
++- Issue #12451: pydoc: importfile() now opens the Python script in binary mode,
++  instead of text mode using the locale encoding, to avoid encoding issues.
++
 +- Issue #12451: runpy: run_path() now opens the Python script in binary mode,
 +  instead of text mode using the locale encoding, to support other encodings
 +  than UTF-8 (scripts using the coding cookie).
 +
 +- Issue #12451: xml.dom.pulldom: parse() now opens files in binary mode instead
 +  of the text mode (using the locale encoding) to avoid encoding issues.
 +
  - Issue #12147: Adjust the new-in-3.2 smtplib.send_message method for better
    conformance to the RFCs:  correctly handle Sender and Resent- headers.