[Python-checkins] cpython (merge 3.4 -> default): merge 3.4

[benjamin.peterson]

https://hg.python.org/cpython/rev/e18062a98a33
changeset:   95059:e18062a98a33
parent:      95056:d1bf181afa82
parent:      95057:21e783129c1d
user:        Benjamin Peterson <benjamin at python.org>
date:        Wed Mar 18 21:36:23 2015 -0500
summary:
  merge 3.4

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


diff --git a/Lib/_pyio.py b/Lib/_pyio.py
--- a/Lib/_pyio.py
+++ b/Lib/_pyio.py
@@ -25,8 +25,8 @@
 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

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