Merge branch 'master' into video-upload

diff --cc tests/test_api.py
Simple merge

diff --cc tweepy/api.py
index 85f28983c6ed5eae815ea62bfc4a21fa602c4b28,4855c94f45162ef26589e0fa0f60ebae005057e4..c4f816ac8a7f35928617f333c670f48737fc8636
--- 1/tweepy/api.py
--- 2/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