From: Harmon <Harmon758@gmail.com>
Date: Tue, 13 Apr 2021 02:24:19 +0000 (-0500)
Subject: Replace API v1.1 models in package namespace
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=f5beb23880a38bc45394b6d12b9be01f81a09931;p=tweepy.git

Replace API v1.1 models in package namespace
---

diff --git a/tests/test_api.py b/tests/test_api.py
index f123363..f4245eb 100644
--- a/tests/test_api.py
+++ b/tests/test_api.py
@@ -6,7 +6,8 @@ import unittest
 from ast import literal_eval
 
 from .config import tape, TweepyTestCase, use_replay, 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'
diff --git a/tweepy/__init__.py b/tweepy/__init__.py
index 1488505..b03f745 100644
--- a/tweepy/__init__.py
+++ b/tweepy/__init__.py
@@ -19,16 +19,12 @@ from tweepy.errors import (
     TweepyException, TwitterServerError, Unauthorized
 )
 from tweepy.media import Media
-from tweepy.models import (
-    DirectMessage, Friendship, ModelFactory, SavedSearch, SearchResults,
-    Status, User
-)
 from tweepy.pagination import Paginator
 from tweepy.place import Place
 from tweepy.poll import Poll
 from tweepy.streaming import Stream
 from tweepy.tweet import ReferencedTweet, Tweet
-# from tweepy.user import User
+from tweepy.user import User
 
 # Global, unauthenticated instance of API
 api = API()