Make test_socket work.

Don't exclude test_socket from the tests to run.
This commit is contained in:
Guido van Rossum 2007-06-08 00:07:57 +00:00
parent 7cad4f3d02
commit 2bf7138bb7
2 changed files with 14 additions and 8 deletions

View File

@ -300,17 +300,23 @@ class IOBase:
def readline(self, limit: int = -1) -> bytes: def readline(self, limit: int = -1) -> bytes:
"""For backwards compatibility, a (slowish) readline().""" """For backwards compatibility, a (slowish) readline()."""
if hasattr(self, "peek"):
def nreadahead():
readahead = self.peek(1, unsafe=True)
if not readahead:
return 1
n = (readahead.find(b"\n") + 1) or len(readahead)
if limit >= 0:
n = min(n, limit)
return n
else:
def nreadahead():
return 1
if limit is None: if limit is None:
limit = -1 limit = -1
res = bytes() res = bytes()
while limit < 0 or len(res) < limit: while limit < 0 or len(res) < limit:
readahead = self.peek(1, unsafe=True) b = self.read(nreadahead())
if not readahead:
break
n = (readahead.find(b"\n") + 1) or len(readahead)
if limit >= 0:
n = min(n, limit)
b = self.read(n)
if not b: if not b:
break break
res += b res += b

View File

@ -27,7 +27,7 @@ mkdir -p OUT
# Compute the list of tests to run. # Compute the list of tests to run.
case $# in case $# in
0) 0)
TESTS=`(cd Lib/test; ls test_*.py | sed 's/\.py//' | grep -v test_socket)` TESTS=`(cd Lib/test; ls test_*.py | sed 's/\.py//')`
;; ;;
*) *)
TESTS="$@" TESTS="$@"