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.
........
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)
diff --git a/Lib/test/test_httpservers.py b/Lib/test/test_httpservers.py
index 49474f6..0615905 100644
--- a/Lib/test/test_httpservers.py
+++ b/Lib/test/test_httpservers.py
@@ -292,14 +292,22 @@
self.cgi_dir = os.path.join(self.parent_dir, 'cgi-bin')
os.mkdir(self.cgi_dir)
+ # The shebang line should be pure ASCII: use symlink if possible.
+ # See issue #7668.
+ if hasattr(os, 'symlink'):
+ self.pythonexe = os.path.join(self.parent_dir, 'python')
+ os.symlink(sys.executable, self.pythonexe)
+ else:
+ self.pythonexe = sys.executable
+
self.file1_path = os.path.join(self.cgi_dir, 'file1.py')
with open(self.file1_path, 'w') as file1:
- file1.write(cgi_file1 % sys.executable)
+ file1.write(cgi_file1 % self.pythonexe)
os.chmod(self.file1_path, 0777)
self.file2_path = os.path.join(self.cgi_dir, 'file2.py')
with open(self.file2_path, 'w') as file2:
- file2.write(cgi_file2 % sys.executable)
+ file2.write(cgi_file2 % self.pythonexe)
os.chmod(self.file2_path, 0777)
self.cwd = os.getcwd()
@@ -308,6 +316,8 @@
def tearDown(self):
try:
os.chdir(self.cwd)
+ if self.pythonexe != sys.executable:
+ os.remove(self.pythonexe)
os.remove(self.file1_path)
os.remove(self.file2_path)
os.rmdir(self.cgi_dir)
diff --git a/Misc/NEWS b/Misc/NEWS
index 38c5f36..edb0a4b 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -62,6 +62,11 @@
variable anymore. It also forwards the LDFLAGS settings to the linker
when building a shared library.
+Tests
+-----
+
+- Issue #7667: Fix doctest failures with non-ASCII paths.
+
What's New in Python 2.6.5?
===========================