diff options
| author | Stefan Krah <skrah@bytereef.org> | 2012-11-06 22:51:42 (GMT) |
|---|---|---|
| committer | Stefan Krah <skrah@bytereef.org> | 2012-11-06 22:51:42 (GMT) |
| commit | cd81709b9e60fe8c814a18d59186208c3ccbdacc (patch) | |
| tree | 12d445a7d856bf9c745cb9f7a4e5c337d71dc067 /Lib/test/test_os.py | |
| parent | e84226ac23c40ca7ab3920f877a4d380792ff7d1 (diff) | |
| parent | 8f049e5b5b360900a5f4d429040c8bfdc89d2fc6 (diff) | |
| download | cpython-cd81709b9e60fe8c814a18d59186208c3ccbdacc.zip cpython-cd81709b9e60fe8c814a18d59186208c3ccbdacc.tar.gz cpython-cd81709b9e60fe8c814a18d59186208c3ccbdacc.tar.bz2 | |
Merge.
Diffstat (limited to 'Lib/test/test_os.py')
| -rw-r--r-- | Lib/test/test_os.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py index 9cf4070..ee19da3 100644 --- a/Lib/test/test_os.py +++ b/Lib/test/test_os.py @@ -1243,6 +1243,8 @@ if sys.platform != 'win32': def setUp(self): if support.TESTFN_UNENCODABLE: self.dir = support.TESTFN_UNENCODABLE + elif support.TESTFN_NONASCII: + self.dir = support.TESTFN_NONASCII else: self.dir = support.TESTFN self.bdir = os.fsencode(self.dir) @@ -1257,6 +1259,8 @@ if sys.platform != 'win32': add_filename(support.TESTFN_UNICODE) if support.TESTFN_UNENCODABLE: add_filename(support.TESTFN_UNENCODABLE) + if support.TESTFN_NONASCII: + add_filename(support.TESTFN_NONASCII) if not bytesfn: self.skipTest("couldn't create any non-ascii filename") |