Skip to content

Commit 8907ca2

Browse files
committed
Inline self.read, simplifying overall
1 parent c309705 commit 8907ca2

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

Lib/_pyio.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1695,20 +1695,21 @@ def readall(self):
16951695
def readinto(self, b):
16961696
"""Same as RawIOBase.readinto()."""
16971697
m = memoryview(b).cast('B')
1698-
if not hasattr(os, 'readv'):
1699-
data = self.read(len(m))
1700-
n = len(data)
1701-
m[:n] = data
1702-
return n
1703-
17041698
self._checkClosed()
17051699
self._checkReadable()
17061700
try:
1707-
return os.readv(self._fd, (m, ))
1701+
if hasattr(os, 'readv'):
1702+
return os.readv(self._fd, (m, ))
1703+
1704+
data = os.read(self._fd, len(m))
1705+
n = len(data)
1706+
m[:n] = data
1707+
return n
17081708
except BlockingIOError:
17091709
return None
17101710

17111711

1712+
17121713
def write(self, b):
17131714
"""Write bytes b to file, return number written.
17141715

0 commit comments

Comments
 (0)