[Python-checkins] r85662 - python/branches/py3k/Lib/test/test_httpservers.py

[victor.stinner]

Author: victor.stinner
Date: Sun Oct 17 22:13:36 2010
New Revision: 85662

Log:
test_httpservers: Fix skip test check, the python executable path have to be
encodable to utf-8, not to the file1 encoding.


Modified:
   python/branches/py3k/Lib/test/test_httpservers.py

Modified: python/branches/py3k/Lib/test/test_httpservers.py
==============================================================================
--- python/branches/py3k/Lib/test/test_httpservers.py	(original)
+++ python/branches/py3k/Lib/test/test_httpservers.py	Sun Oct 17 22:13:36 2010
@@ -310,15 +310,18 @@
         else:
             self.pythonexe = sys.executable
 
+        try:
+            # The python executable path is written as the first line of the
+            # CGI Python script. The encoding cookie cannot be used, and so the
+            # path should be encodable to the default script encoding (utf-8)
+            self.pythonexe.encode('utf-8')
+        except UnicodeEncodeError:
+            self.tearDown()
+            raise self.skipTest(
+                "Python executable path is not encodable to utf-8")
+
         self.file1_path = os.path.join(self.cgi_dir, 'file1.py')
         with open(self.file1_path, 'w') as file1:
-            try:
-                self.pythonexe.encode(file1.encoding)
-            except UnicodeEncodeError:
-                self.tearDown()
-                raise self.skipTest(
-                    "Python executable path is not encodable to %s"
-                    % file1.encoding)
             file1.write(cgi_file1 % self.pythonexe)
         os.chmod(self.file1_path, 0o777)