Merged revisions 78272 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r78272 | ezio.melotti | 2010-02-21 00:34:21 +0200 (Sun, 21 Feb 2010) | 1 line
skip tests with a non-ascii cwd when the file system encoding is ascii
........
diff --git a/Lib/test/test_macpath.py b/Lib/test/test_macpath.py
index 81374d1..24d8bb2 100644
--- a/Lib/test/test_macpath.py
+++ b/Lib/test/test_macpath.py
@@ -1,4 +1,5 @@
import os
+import sys
import macpath
from test import test_support
import unittest
@@ -12,7 +13,13 @@
# Issue 3426: check that abspath retuns unicode when the arg is unicode
# and str when it's str, with both ASCII and non-ASCII cwds
saved_cwd = os.getcwd()
- for cwd in (u'cwd', u'\xe7w\xf0'):
+ cwds = ['cwd']
+ try:
+ cwds.append(u'\xe7w\xf0'.encode(sys.getfilesystemencoding()
+ or 'ascii'))
+ except UnicodeEncodeError:
+ pass # the cwd can't be encoded -- test with ascii cwd only
+ for cwd in cwds:
try:
os.mkdir(cwd)
os.chdir(cwd)