From: Harmon <Harmon758@gmail.com>
Date: Tue, 13 Apr 2021 05:49:43 +0000 (-0500)
Subject: Merge branch 'master' into api-v2
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=9a28e0eaa7329918bfbf19e08afccb473210a2d1;p=tweepy.git

Merge branch 'master' into api-v2
---

9a28e0eaa7329918bfbf19e08afccb473210a2d1
diff --cc tests/test_api.py
index f4245eb,3c03b12..24c7047
--- a/tests/test_api.py
+++ b/tests/test_api.py
@@@ -5,9 -5,8 +5,9 @@@ import tim
  import unittest
  from ast import literal_eval
  
- from .config import tape, TweepyTestCase, use_replay, username
+ from .config import tape, TweepyTestCase, username
 -from tweepy import API, FileCache, Friendship, MemoryCache
 +from tweepy import API, FileCache, MemoryCache
 +from tweepy.models import Friendship
  from tweepy.parsers import Parser
  
  test_tweet_id = '266367358078169089'