diff options
| author | Martin Panter <vadmium+py@gmail.com> | 2016-11-14 05:04:12 (GMT) |
|---|---|---|
| committer | Martin Panter <vadmium+py@gmail.com> | 2016-11-14 05:04:12 (GMT) |
| commit | f8cebad2901799ebfceb3228a7ba69a504e21f75 (patch) | |
| tree | 2295b6b8cb9e7785ce54e92bd85505e92933e34d /Lib | |
| parent | f8c25e3424818b12f8029a8122672037098ee8a4 (diff) | |
| parent | c9e08d8cb508aecaaa327ee1f27fe4164235f682 (diff) | |
| download | cpython-f8cebad2901799ebfceb3228a7ba69a504e21f75.zip cpython-f8cebad2901799ebfceb3228a7ba69a504e21f75.tar.gz cpython-f8cebad2901799ebfceb3228a7ba69a504e21f75.tar.bz2 | |
Merge AIX fixes from 3.5 into 3.6
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/test/test_fileio.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/test_fileio.py b/Lib/test/test_fileio.py index 59cc38f..12f2f11 100644 --- a/Lib/test/test_fileio.py +++ b/Lib/test/test_fileio.py @@ -377,7 +377,7 @@ class OtherFileTests: self.assertEqual(f.writable(), True) if sys.platform != "darwin" and \ 'bsd' not in sys.platform and \ - not sys.platform.startswith('sunos'): + not sys.platform.startswith(('sunos', 'aix')): # Somehow /dev/tty appears seekable on some BSDs self.assertEqual(f.seekable(), False) self.assertEqual(f.isatty(), True) |