do not blindly catch all AttributeErrors

see shazow/urllib3#618
2026-06-05 22:50:18 +00:00 · 2015-05-12 23:21:03 +00:00
parent 868625532d
commit c6c8d649af
1 changed files with 4 additions and 3 deletions
@@ -648,9 +648,10 @@ class Response(object):
        If decode_unicode is True, content will be decoded using the best
        available encoding based on the response.
        """
+
        def generate():
-            try:
-                # Special case for urllib3.
+            # Special case for urllib3.
+            if hasattr(self.raw, 'stream'):
                try:
                    for chunk in self.raw.stream(chunk_size, decode_content=True):
                        yield chunk
@@ -660,7 +661,7 @@ class Response(object):
                    raise ContentDecodingError(e)
                except ReadTimeoutError as e:
                    raise ConnectionError(e)
-            except AttributeError:
+            else:
                # Standard file-like object.
                while True:
                    chunk = self.raw.read(chunk_size)