summaryrefslogtreecommitdiffstats
path: root/Lib/doctest.py
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2007-08-03 18:40:49 (GMT)
committerGuido van Rossum <guido@python.org>2007-08-03 18:40:49 (GMT)
commitad8d30092ccebad0f940fe0ed3ff25a18c25dddf (patch)
tree368f9ee7089ab4932a273b56e8e8de9bf502afab /Lib/doctest.py
parent6afaeb757af0dbd8508a0f2352ade61e41bec84c (diff)
downloadcpython-ad8d30092ccebad0f940fe0ed3ff25a18c25dddf.zip
cpython-ad8d30092ccebad0f940fe0ed3ff25a18c25dddf.tar.gz
cpython-ad8d30092ccebad0f940fe0ed3ff25a18c25dddf.tar.bz2
SF patch# 1766592 by Paul Colomiets.
Fix test_zipimport.
Diffstat (limited to 'Lib/doctest.py')
-rw-r--r--Lib/doctest.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/doctest.py b/Lib/doctest.py
index 3f139fc..bc30a1a 100644
--- a/Lib/doctest.py
+++ b/Lib/doctest.py
@@ -209,7 +209,7 @@ def _load_testfile(filename, package, module_relative):
filename = _module_relative_path(package, filename)
if hasattr(package, '__loader__'):
if hasattr(package.__loader__, 'get_data'):
- return package.__loader__.get_data(filename), filename
+ return package.__loader__.get_data(filename).decode('utf-8'), filename
return open(filename, encoding="utf-8").read(), filename
def _indent(s, indent=4):