summaryrefslogtreecommitdiffstats
path: root/Lib/_pyio.py
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2015-03-19 02:36:23 (GMT)
committerBenjamin Peterson <benjamin@python.org>2015-03-19 02:36:23 (GMT)
commit41ce610d4ca12ce96aa3a9b9139e416039b18f7b (patch)
treeb996df18895ef0c85962767859b5a164fe849663 /Lib/_pyio.py
parent8a0b9a4bf3cdbe59e562c5d0c27388ca7210f5a0 (diff)
parent86fdbf3152f2c19c483da5cce4b4d74539d1407b (diff)
downloadcpython-41ce610d4ca12ce96aa3a9b9139e416039b18f7b.zip
cpython-41ce610d4ca12ce96aa3a9b9139e416039b18f7b.tar.gz
cpython-41ce610d4ca12ce96aa3a9b9139e416039b18f7b.tar.bz2
merge 3.4
Diffstat (limited to 'Lib/_pyio.py')
-rw-r--r--Lib/_pyio.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/_pyio.py b/Lib/_pyio.py
index b0f0114..f1611a4 100644
--- a/Lib/_pyio.py
+++ b/Lib/_pyio.py
@@ -25,8 +25,8 @@ if hasattr(os, 'SEEK_HOLE') :
DEFAULT_BUFFER_SIZE = 8 * 1024 # bytes
# NOTE: Base classes defined here are registered with the "official" ABCs
-# defined in io.py. We don't use real inheritance though, because we don't
-# want to inherit the C implementations.
+# defined in io.py. We don't use real inheritance though, because we don't want
+# to inherit the C implementations.
# Rebind for compatibility
BlockingIOError = BlockingIOError