Issue #26384: Merge from 3.5

This commit is contained in:
Berker Peksag 2016-09-17 23:23:13 +03:00
commit 5d625cff07
3 changed files with 22 additions and 1 deletions

View file

@ -268,7 +268,7 @@ class socket(_socket.socket):
raise _GiveupOnSendfile(err) # not a regular file
try:
fsize = os.fstat(fileno).st_size
except OSError:
except OSError as err:
raise _GiveupOnSendfile(err) # not a regular file
if not fsize:
return 0 # empty file