From 673336ff8f8a9a647fc8e44cb05f6c8a0ec39c98 Mon Sep 17 00:00:00 2001
From: Cory Benfield <lukasaoz@gmail.com>
Date: Sun, 23 Feb 2014 14:57:03 +0000
Subject: [PATCH 1/3] Failing test for Accept-Encoding header

---
 tests/test_core.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/tests/test_core.py b/tests/test_core.py
index df20660..4870688 100644
--- a/tests/test_core.py
+++ b/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('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"""

From 31ff35349cc6a79bd4385cce26b76578ac41239f Mon Sep 17 00:00:00 2001
From: Cory Benfield <lukasaoz@gmail.com>
Date: Sun, 23 Feb 2014 15:06:44 +0000
Subject: [PATCH 2/3] Merge headers, don't overwrite.

---
 twython/api.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/twython/api.py b/twython/api.py
index db79381..88b6735 100644
--- a/twython/api.py
+++ b/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):

From f514816c6f9905da9e76d598cdbeb8f32a8ca63b Mon Sep 17 00:00:00 2001
From: Cory Benfield <lukasaoz@gmail.com>
Date: Sun, 23 Feb 2014 15:12:44 +0000
Subject: [PATCH 3/3] Fixup python3 test failure.

---
 tests/test_core.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_core.py b/tests/test_core.py
index 4870688..5b8a374 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -286,7 +286,7 @@ class TwythonAPITestCase(unittest.TestCase):
 
         self.api.get(endpoint)
 
-        self.assertEqual('gzip, deflate, compress', responses.calls[0].request.headers['Accept-Encoding'])
+        self.assertEqual(b'gzip, deflate, compress', responses.calls[0].request.headers['Accept-Encoding'])
 
     # Static methods
     def test_construct_api_url(self):