[Python-checkins] cpython (merge 3.5 -> default): Issue #22854: Merge test fix from 3.5

[martin.panter]

https://hg.python.org/cpython/rev/de8412dc477e
changeset:   100817:de8412dc477e
parent:      100815:96a98bcaac70
parent:      100816:b3c79e0ba477
user:        Martin Panter <vadmium+py at gmail.com>
date:        Thu Mar 31 21:06:06 2016 +0000
summary:
  Issue #22854: Merge test fix from 3.5

files:
  Lib/test/test_io.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py
--- a/Lib/test/test_io.py
+++ b/Lib/test/test_io.py
@@ -449,7 +449,7 @@
                 else:
                     self.assertRaises(OSError, obj.write, data)
 
-                if sys.platform.startswith("win") or test in (
+                if sys.platform.startswith("win") and test in (
                         pipe_reader, pipe_writer):
                     # Pipes seem to appear as seekable on Windows
                     continue

-- 
Repository URL: https://hg.python.org/cpython