Merge pull request #1175 from benoitc/fix/1174

reuse util.is_fileobject
This commit is contained in:
Benoit Chesneau 2016-01-02 14:35:08 +01:00
commit 305f373dc6
2 changed files with 4 additions and 6 deletions

View File

@ -353,9 +353,7 @@ class Response(object):
if self.cfg.is_ssl or not self.can_sendfile():
return False
try:
fileno = respiter.filelike.fileno()
except AttributeError:
if not util.has_fileno(respiter.filelike):
return False
try:

View File

@ -510,14 +510,14 @@ def to_bytestring(value, encoding="utf8"):
return value.encode(encoding)
def is_fileobject(obj):
if not hasattr(obj, "tell") or not hasattr(obj, "fileno"):
def has_fileno(obj):
if not hasattr(obj, "fileno"):
return False
# check BytesIO case and maybe others
try:
obj.fileno()
except (IOError, io.UnsupportedOperation):
except (AttributeError, IOError, io.UnsupportedOperation):
return False
return True