Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 7a0d398

Browse files
committed
Remove the "unsafe" flag on peek() -- it is no longer used, because
self._read_buf is an immutable bytes object.
1 parent 434dd24 commit 7a0d398

1 file changed

Lines changed: 8 additions & 13 deletions

File tree

Lib/io.py

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ def readline(self, limit: int = -1) -> bytes:
397397
"""For backwards compatibility, a (slowish) readline()."""
398398
if hasattr(self, "peek"):
399399
def nreadahead():
400-
readahead = self.peek(1, unsafe=True)
400+
readahead = self.peek(1)
401401
if not readahead:
402402
return 1
403403
n = (readahead.find(b"\n") + 1) or len(readahead)
@@ -785,14 +785,12 @@ def read(self, n=None):
785785
out = nodata_val
786786
return out
787787

788-
def peek(self, n=0, *, unsafe=False):
788+
def peek(self, n=0):
789789
"""Returns buffered bytes without advancing the position.
790790
791791
The argument indicates a desired minimal number of bytes; we
792792
do at most one raw read to satisfy it. We never return more
793793
than self.buffer_size.
794-
795-
Unless unsafe=True is passed, we return a copy.
796794
"""
797795
want = min(n, self.buffer_size)
798796
have = len(self._read_buf)
@@ -801,10 +799,7 @@ def peek(self, n=0, *, unsafe=False):
801799
current = self.raw.read(to_read)
802800
if current:
803801
self._read_buf += current
804-
result = self._read_buf
805-
if unsafe:
806-
result = result[:]
807-
return result
802+
return self._read_buf
808803

809804
def read1(self, n):
810805
"""Reads up to n bytes.
@@ -815,7 +810,7 @@ def read1(self, n):
815810
"""
816811
if n <= 0:
817812
return b""
818-
self.peek(1, unsafe=True)
813+
self.peek(1)
819814
return self.read(min(n, len(self._read_buf)))
820815

821816
def tell(self):
@@ -930,8 +925,8 @@ def readinto(self, b):
930925
def write(self, b):
931926
return self.writer.write(b)
932927

933-
def peek(self, n=0, *, unsafe=False):
934-
return self.reader.peek(n, unsafe=unsafe)
928+
def peek(self, n=0):
929+
return self.reader.peek(n)
935930

936931
def read1(self, n):
937932
return self.reader.read1(n)
@@ -991,9 +986,9 @@ def readinto(self, b):
991986
self.flush()
992987
return BufferedReader.readinto(self, b)
993988

994-
def peek(self, n=0, *, unsafe=False):
989+
def peek(self, n=0):
995990
self.flush()
996-
return BufferedReader.peek(self, n, unsafe=unsafe)
991+
return BufferedReader.peek(self, n)
997992

998993
def read1(self, n):
999994
self.flush()

0 commit comments

Comments
 (0)