Merge #491

diff --git a/AUTHORS.rst b/AUTHORS.rst
index 243033fbfc81ad470f1a6b2a5bf3c57289f95337..f3816222341d4ba388abbd29d877602e6b4d6af9 100644 (file)
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -89,4 +89,5 @@ Patches and Suggestions
 - Danver Braganza <danverbraganza@gmail.com>
 - Max Countryman
 - Nick Chadwick
-- Jonathan Drosdeck
\ No newline at end of file
+- Jonathan Drosdeck
+- Jiri Machalek

diff --git a/HISTORY.rst b/HISTORY.rst
index d43585c4c5cb6fe7e6672a10ebc476fb5dc23e56..6604fbe0f5dbe5bebbeb8fdb45bc32df5d20a11e 100644 (file)
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -5,7 +5,7 @@ History
 +++++++++++++++++++
 
 * Private SSL Certificate support
-*
+* Remove select.poll from Gevent monkeypatching
 
 0.10.8 (2012-03-09)
 +++++++++++++++++++

diff --git a/requests/models.py b/requests/models.py
index ac1a9e2f43ab7deaf84d7d9e35bca42bcda5a96a..0c74afada332b9fc334c18b1b908dd90bac9fa53 100644 (file)
--- a/requests/models.py
+++ b/requests/models.py
@@ -683,39 +683,7 @@ class Response(object):
                 yield chunk
             self._content_consumed = True
 
-        def generate_chunked():
-            resp = self.raw._original_response
-            fp = resp.fp
-            if resp.chunk_left is not None:
-                pending_bytes = resp.chunk_left
-                while pending_bytes:
-                    chunk = fp.read(min(chunk_size, pending_bytes))
-                    pending_bytes -= len(chunk)
-                    yield chunk
-                fp.read(2)  # throw away crlf
-            while 1:
-                #XXX correct line size? (httplib has 64kb, seems insane)
-                pending_bytes = fp.readline(40).strip()
-                if not len(pending_bytes):
-                    # No content, like a HEAD request. Break out.
-                    break
-                pending_bytes = int(pending_bytes, 16)
-                if pending_bytes == 0:
-                    break
-                while pending_bytes:
-                    chunk = fp.read(min(chunk_size, pending_bytes))
-                    pending_bytes -= len(chunk)
-                    yield chunk
-                fp.read(2)  # throw away crlf
-            self._content_consumed = True
-            fp.close()
-
-        if getattr(getattr(self.raw, '_original_response', None), 'chunked', False):
-            gen = generate_chunked()
-        else:
-            gen = generate()
-
-        gen = stream_untransfer(gen, self)
+        gen = stream_untransfer(generate(), self)
 
         if decode_unicode:
             gen = stream_decode_response_unicode(gen, self)