Merge branch 'master' of github.com:ryanmcgrath/twython into cursor-pages

Conflicts:
	twython/api.py

tests/test_core.py

@@ -277,6 +277,17 @@ class TwythonAPITestCase(unittest.TestCase):
         """Test attempting to get a header when no API call was made raises a TwythonError"""
         self.assertRaises(TwythonError, self.api.get_lastfunction_header, 'no-api-call-was-made')
 
+    @responses.activate
+    def test_sends_correct_accept_encoding_header(self):
+        """Test that Twython accepts compressed data."""
+        endpoint = 'statuses/home_timeline'
+        url = self.get_url(endpoint)
+        self.register_response(responses.GET, url)
+
+        self.api.get(endpoint)
+
+        self.assertEqual(b'gzip, deflate, compress', responses.calls[0].request.headers['Accept-Encoding'])
+
     # Static methods
     def test_construct_api_url(self):
         """Test constructing a Twitter API url works as we expect"""

twython/api.py

@@ -109,10 +109,14 @@ class Twython(EndpointsMixin, object):
         # Never be used again.
         client_args_copy = self.client_args.copy()
         for k, v in client_args_copy.items():
-            if k in ('cert', 'headers', 'hooks', 'max_redirects', 'proxies'):
+            if k in ('cert', 'hooks', 'max_redirects', 'proxies'):
                 setattr(self.client, k, v)
                 self.client_args.pop(k)  # Pop, pop!
 
+        # Headers are always present, so we unconditionally pop them and merge
+        # them into the session headers.
+        self.client.headers.update(self.client_args.pop('headers'))
+
         self._last_call = None
 
     def __repr__(self):
@@ -406,6 +410,7 @@ class Twython(EndpointsMixin, object):
         if not hasattr(function, 'iter_mode'):
             raise TwythonError('Unable to create generator for Twython method "%s"' % function.__name__)
 
+        while True:
             content = function(**params)
 
             if not content:
@@ -439,9 +444,6 @@ class Twython(EndpointsMixin, object):
             except (TypeError, ValueError):  # pragma: no cover
                 raise TwythonError('Unable to generate next page of search results, `page` is not a number.')
 
-        for result in self.cursor(function, return_pages=return_pages, **params):
-            yield result
-
     @staticmethod
     def unicode2utf8(text):
         try: