summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth Reitz <me@kennethreitz.com>2013-08-06 08:43:44 -0700
committerKenneth Reitz <me@kennethreitz.com>2013-08-06 08:43:44 -0700
commitd3b786399e1a1041426cd6ab6a619b58a86d6300 (patch)
tree38a47381d6f1fdeaa23d99f905fb6ea6e6009610
parenta05aba10330e73bc8fcc8af08dc8508668e1e0ee (diff)
parenta5e5a51fb4e7202910172624bcc732700422a738 (diff)
downloadpython-requests-d3b786399e1a1041426cd6ab6a619b58a86d6300.tar.gz
Merge pull request #1516 from Lukasa/io
UnsupportedOperation errors
-rw-r--r--requests/models.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/requests/models.py b/requests/models.py
index ee9c329b..6b4a2994 100644
--- a/requests/models.py
+++ b/requests/models.py
@@ -11,7 +11,7 @@ import collections
import logging
import datetime
-from io import BytesIO
+from io import BytesIO, UnsupportedOperation
from .hooks import default_hooks
from .structures import CaseInsensitiveDict
@@ -385,7 +385,7 @@ class PreparedRequest(RequestEncodingMixin, RequestHooksMixin):
try:
length = super_len(data)
- except (TypeError, AttributeError):
+ except (TypeError, AttributeError, UnsupportedOperation):
length = None
if is_stream: