Merge branch 'master' into python-3.5-support-removal

diff --cc tests/test_api.py
index f86bbcf08164121c7128f9b630603bd4209a3f39,e834c66b514d6c6b607b56004ac9895b7d720a0e..e404d3bdbfdf6dd9ce2eab36fab21b1f60d670b5
--- 1/tests/test_api.py
--- 2/tests/test_api.py
+++ b/tests/test_api.py
@@@ -427,8 -427,8 +427,8 @@@ class TweepyCacheTests(unittest.TestCas
              self.assertEqual(self.cache.count(), 0, 'Cache cleanup failed')
  
          # test count
-         for i in range(0, 20):
+         for i in range(20):
 -            self.cache.store('testkey%i' % i, 'testvalue')
 +            self.cache.store(f'testkey{i}', 'testvalue')
          self.assertEqual(self.cache.count(), 20, 'Count is wrong')
  
          # test flush

diff --cc tweepy/api.py
Simple merge