diff options
author | Florent Xicluna <florent.xicluna@gmail.com> | 2010-03-22 17:18:18 (GMT) |
---|---|---|
committer | Florent Xicluna <florent.xicluna@gmail.com> | 2010-03-22 17:18:18 (GMT) |
commit | 0805e6eed94015cee09ba052deda2e1c94c182b3 (patch) | |
tree | 96ecf3d9b3d39a0e77caaf89d4fbd84b19ccd05a /Lib/test | |
parent | eba2aca4bddf3847dac687aba85e6010f67a632b (diff) | |
download | cpython-0805e6eed94015cee09ba052deda2e1c94c182b3.zip cpython-0805e6eed94015cee09ba052deda2e1c94c182b3.tar.gz cpython-0805e6eed94015cee09ba052deda2e1c94c182b3.tar.bz2 |
#7668: Fix test_httpservers failure when sys.executable contains non-ASCII bytes.
Diffstat (limited to 'Lib/test')
-rw-r--r-- | Lib/test/test_httpservers.py | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/Lib/test/test_httpservers.py b/Lib/test/test_httpservers.py index 7bd0fe8..287ad53 100644 --- a/Lib/test/test_httpservers.py +++ b/Lib/test/test_httpservers.py @@ -297,14 +297,22 @@ class CGIHTTPServerTestCase(BaseTestCase): 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() @@ -313,6 +321,8 @@ class CGIHTTPServerTestCase(BaseTestCase): 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) |