Fix media upload crashs on python3

Should fix #257, #265 & #269, please check @sixohsix @alepg @simmons449 @ok1rig

diff --git a/twitter/api.py b/twitter/api.py
index dbeab2022f0e6c002d8716feb0d5d731554327a5..3a2964185e0c14f0ef2a3ac3e1af1cac8196f482 100644 (file)
--- a/twitter/api.py
+++ b/twitter/api.py
@@ -288,15 +288,13 @@ class TwitterCall(object):
             bod.append(b'')
             body = b'\r\n'.join(bod)
             # print(body.decode('utf-8', errors='ignore'))
-            headers[b'Content-Type'] = \
+            headers['Content-Type'] = \
                 b'multipart/form-data; boundary=' + BOUNDARY
 
-            for k in headers:
-                headers[actually_bytes(k)] = actually_bytes(headers.pop(k))
-            # print(headers)
-
             if not PY_3_OR_HIGHER:
                 url_base = url_base.encode("utf-8")
+                for k in headers:
+                    headers[actually_bytes(k)] = actually_bytes(headers.pop(k))
 
         req = urllib_request.Request(url_base, data=body, headers=headers)
         if self.retry: