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] 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):