[Python-checkins] r79297 - python/trunk/Lib/test/test_httpservers.py

[florent.xicluna]

Author: florent.xicluna
Date: Mon Mar 22 18:18:18 2010
New Revision: 79297

Log:
#7668: Fix test_httpservers failure when sys.executable contains non-ASCII bytes.


Modified:
   python/trunk/Lib/test/test_httpservers.py

Modified: python/trunk/Lib/test/test_httpservers.py
==============================================================================
--- python/trunk/Lib/test/test_httpservers.py	(original)
+++ python/trunk/Lib/test/test_httpservers.py	Mon Mar 22 18:18:18 2010
@@ -297,14 +297,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()
@@ -313,6 +321,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)