From: Harmon <Harmon758@gmail.com>
Date: Sun, 4 Apr 2021 14:28:52 +0000 (-0500)
Subject: Merge branch 'master' into video-upload
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=a52aae0d77cb00c236f2dd53c590c70eb5fb16d2;p=tweepy.git

Merge branch 'master' into video-upload
---

a52aae0d77cb00c236f2dd53c590c70eb5fb16d2
diff --cc tweepy/api.py
index 85f2898,4855c94..c4f816a
--- a/tweepy/api.py
+++ b/tweepy/api.py
@@@ -172,11 -175,11 +175,11 @@@ class API
                  try:
                      resp = self.session.request(
                          method, url, params=params, headers=headers,
 -                        data=post_data, json=json_payload, timeout=self.timeout,
 -                        auth=auth, proxies=self.proxy
 +                        data=post_data, files=files, json=json_payload,
 +                        timeout=self.timeout, auth=auth, proxies=self.proxy
                      )
                  except Exception as e:
-                     raise TweepError(f'Failed to send request: {e}').with_traceback(sys.exc_info()[2])
+                     raise TweepyException(f'Failed to send request: {e}').with_traceback(sys.exc_info()[2])
  
                  if 200 <= resp.status_code < 300:
                      break