commit 61b9c3ed5f8eb38c960512e1051942853a052005
author Florent Xicluna <florent.xicluna@gmail.com> Tue Mar 23 13:30:12 2010 +0000
committer Florent Xicluna <florent.xicluna@gmail.com> Tue Mar 23 13:30:12 2010 +0000
tree a8801e92d1569ef9561fc90980b860358a0649b8
parent 4f5e828d95e42d1cf010ea23999821991baec26d

Merged revisions 79297,79307 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79297 | florent.xicluna | 2010-03-22 18:18:18 +0100 (lun, 22 mar 2010) | 2 lines

  #7668: Fix test_httpservers failure when sys.executable contains non-ASCII bytes.
........
  r79307 | florent.xicluna | 2010-03-22 23:45:50 +0100 (lun, 22 mar 2010) | 2 lines

  #7667: Fix doctest failures with non-ASCII paths.
........

Lib/doctest.py

diff --git a/Lib/doctest.py b/Lib/doctest.py
index 8134170..9accb81 100644
--- a/Lib/doctest.py
+++ b/Lib/doctest.py
@@ -1328,7 +1328,8 @@
         m = self.__LINECACHE_FILENAME_RE.match(filename)
         if m and m.group('name') == self.test.name:
             example = self.test.examples[int(m.group('examplenum'))]
-            return example.source.splitlines(True)
+            source = example.source.encode('ascii', 'backslashreplace')
+            return source.splitlines(True)
         else:
             return self.save_linecache_getlines(filename, module_globals)