merge 3.4

This commit is contained in:
Benjamin Peterson 2015-03-18 21:36:23 -05:00
commit 41ce610d4c
1 changed files with 2 additions and 2 deletions

View File

@ -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