code/twython
1
Fork 0
Code Issues 23 Pull requests 4 Projects Releases 5 Packages Wiki Activity Actions

Merge pull request #310 from Lukasa/master

Browse source 
Twython unnecessarily disables compression.
This commit is contained in:
Mike Helmick 2014-02-25 15:35:58 -05:00
commit bfc497edc0
2 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
tests/test_core.py
View file

@ -277,6 +277,17 @@ class TwythonAPITestCase(unittest.TestCase):
"""Test attempting to get a header when no API call was made raises a TwythonError""" """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') 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 # Static methods
def test_construct_api_url(self): def test_construct_api_url(self):
"""Test constructing a Twitter API url works as we expect""" """Test constructing a Twitter API url works as we expect"""

6
twython/api.py
View file

@ -109,10 +109,14 @@ class Twython(EndpointsMixin, object):
# Never be used again. # Never be used again.
client_args_copy = self.client_args.copy() client_args_copy = self.client_args.copy()
for k, v in client_args_copy.items(): 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) setattr(self.client, k, v)
self.client_args.pop(k) # Pop, pop! 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 self._last_call = None
def __repr__(self): def __repr__(self):