From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Wed, 13 Oct 2010 23:41:57 +0000 (+0000)
Subject: test_sys: Remove workaround #8611
X-Git-Tag: v3.2a4~618
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d24fc5d7c4baed7b0abcf49f06e3030ca61692f7;p=thirdparty%2FPython%2Fcpython.git

test_sys: Remove workaround #8611

It looks like it is no more needed: Python 3.2 is slowly able to support
non-ascii paths with an ascii locale.
---

diff --git a/Lib/test/support.py b/Lib/test/support.py
index df3e493cc71d..08ce0a05fae6 100644
--- a/Lib/test/support.py
+++ b/Lib/test/support.py
@@ -1327,11 +1327,3 @@ def strip_python_stderr(stderr):
     """
     stderr = re.sub(br"\[\d+ refs\]\r?\n?$", b"", stderr).strip()
     return stderr
-
-def workaroundIssue8611():
-    try:
-        sys.executable.encode('ascii')
-    except UnicodeEncodeError:
-        raise unittest.SkipTest(
-            "Issue #8611: Python doesn't support ascii locale encoding "
-            "with an non-ascii path")
diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
index 6e8aa254d737..8c3a1dbc74b1 100644
--- a/Lib/test/test_sys.py
+++ b/Lib/test/test_sys.py
@@ -502,9 +502,6 @@ class SysModuleTest(unittest.TestCase):
     @unittest.skipIf(sys.platform == 'win32',
                      'Windows has a native unicode API')
     def test_undecodable_code(self):
-        # Raise SkipTest() if sys.executable is not encodable to ascii
-        test.support.workaroundIssue8611()
-
         undecodable = b"\xff"
         env = os.environ.copy()
         # Use C locale to get ascii for the locale encoding