Make _load_testfile() use its encoding argument when __loader__ is defined.

diff --git a/Lib/doctest.py b/Lib/doctest.py
index 395f8b6369c486547c18ca44e15d098e08cdf6bb..0b9be45a7bd2b00f8e07ff0926d3b81758829ee6 100644 (file)
--- a/Lib/doctest.py
+++ b/Lib/doctest.py
@@ -209,7 +209,8 @@ def _load_testfile(filename, package, module_relative, encoding):
         filename = _module_relative_path(package, filename)
         if hasattr(package, '__loader__'):
             if hasattr(package.__loader__, 'get_data'):
-                return package.__loader__.get_data(filename).decode('utf-8'), filename
+                return (package.__loader__.get_data(filename).decode(encoding),
+                        filename)
     return open(filename, encoding=encoding).read(), filename
 
 def _indent(s, indent=4):

diff --git a/Misc/NEWS b/Misc/NEWS
index ba37891f7ba26ca8c36327927f175c5d7487a684..749b94c6aeb306358da90688d70917e341b644af 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -14,6 +14,14 @@ Extension Modules
 - The `hotshot` profiler has been removed; use `cProfile` instead.
 
 
+Library
+-------
+
+- When loading an external file using testfile(), the passed-in encoding
+  argument was being ignored if __loader__ is defined and forcing the source to
+  be UTF-8.
+
+
 What's New in Python 3.0a1?
 ==========================