summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2016-03-31 21:06:06 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2016-03-31 21:06:06 (GMT)
commit0fc03186f78a7ac5d90e195fca825d1e7b87aef0 (patch)
treeb181f2796ef1ab53abb29f2f25a527fd73100a7b /Lib
parent7b1e5a7722efe487c8f2a78183c909ecba30b2a5 (diff)
parent3ee147ffbb944646843a7310da7139cbfb985ce0 (diff)
downloadcpython-0fc03186f78a7ac5d90e195fca825d1e7b87aef0.zip
cpython-0fc03186f78a7ac5d90e195fca825d1e7b87aef0.tar.gz
cpython-0fc03186f78a7ac5d90e195fca825d1e7b87aef0.tar.bz2
Issue #22854: Merge test fix from 3.5
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_io.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py
index ab7fedf..1dab166 100644
--- a/Lib/test/test_io.py
+++ b/Lib/test/test_io.py
@@ -449,7 +449,7 @@ class IOTest(unittest.TestCase):
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