Replace API v1.1 models in package namespace

diff --git a/tests/test_api.py b/tests/test_api.py
index f123363e9693618eb2510d6559850c67395f6c4c..f4245ebf0bc9d6dd237dfdf4d01e5c003b72ccca 100644 (file)
--- 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 1488505a88abe1ba96d0b4d6d09510d34e73e42c..b03f7456cfeb782980a4ab9a6f33368301b64050 100644 (file)
--- 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()