diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2016-02-01 11:47:15 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2016-02-01 11:47:15 (GMT) |
| commit | 94c3089818e68462150b325e83bd2996bf6a5ed7 (patch) | |
| tree | 49a5379ad64c96901a90aa9feb73ae46b0ac4bb6 | |
| parent | 58afd2551e3b957966e198a792dd03631ab631ec (diff) | |
| parent | 3e7230904e475982d0aea2c0181ea9e04e0ac6b3 (diff) | |
| download | cpython-94c3089818e68462150b325e83bd2996bf6a5ed7.zip cpython-94c3089818e68462150b325e83bd2996bf6a5ed7.tar.gz cpython-94c3089818e68462150b325e83bd2996bf6a5ed7.tar.bz2 | |
Merge 3.5 (asyncio)
| -rw-r--r-- | Lib/asyncio/selector_events.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Lib/asyncio/selector_events.py b/Lib/asyncio/selector_events.py index 5b26631..812fac1 100644 --- a/Lib/asyncio/selector_events.py +++ b/Lib/asyncio/selector_events.py @@ -682,8 +682,8 @@ class _SelectorSocketTransport(_SelectorTransport): def write(self, data): if not isinstance(data, (bytes, bytearray, memoryview)): - raise TypeError('data argument must be byte-ish (%r)', - type(data)) + raise TypeError('data argument must be a bytes-like object, ' + 'not %r' % type(data).__name__) if self._eof: raise RuntimeError('Cannot call write() after write_eof()') if not data: @@ -954,8 +954,8 @@ class _SelectorSslTransport(_SelectorTransport): def write(self, data): if not isinstance(data, (bytes, bytearray, memoryview)): - raise TypeError('data argument must be byte-ish (%r)', - type(data)) + raise TypeError('data argument must be a bytes-like object, ' + 'not %r' % type(data).__name__) if not data: return @@ -1010,8 +1010,8 @@ class _SelectorDatagramTransport(_SelectorTransport): def sendto(self, data, addr=None): if not isinstance(data, (bytes, bytearray, memoryview)): - raise TypeError('data argument must be byte-ish (%r)', - type(data)) + raise TypeError('data argument must be a bytes-like object, ' + 'not %r' % type(data).__name__) if not data: return |