Remove models.py

tests/conftest.py

@@ -3,7 +3,7 @@ import json
 
 from utils import *
 from contextlib import contextmanager
-from fbchat.models import ThreadType, Message, Mention
+from fbchat import ThreadType, Message, Mention
 
 
 @pytest.fixture(scope="session")

tests/test_base.py

@@ -3,8 +3,7 @@ import py_compile
 
 from glob import glob
 from os import path, environ
-from fbchat import Client
-from fbchat.models import FBchatUserError, Message
+from fbchat import FBchatUserError, Message, Client
 
 
 @pytest.mark.offline

tests/test_fetch.py

@@ -1,7 +1,7 @@
 import pytest
 
 from os import path
-from fbchat.models import ThreadType, Message, Mention, EmojiSize, Sticker
+from fbchat import ThreadType, Message, Mention, EmojiSize, Sticker
 from utils import subset, STICKER_LIST, EMOJI_LIST
 
 

tests/test_message_management.py

@@ -1,6 +1,6 @@
 import pytest
 
-from fbchat.models import Message, MessageReaction
+from fbchat import Message, MessageReaction
 from utils import subset
 
 

tests/test_plans.py

@@ -1,6 +1,6 @@
 import pytest
 
-from fbchat.models import Plan, FBchatFacebookError, ThreadType
+from fbchat import Plan, FBchatFacebookError, ThreadType
 from utils import random_hex, subset
 from time import time
 

tests/test_polls.py

@@ -1,6 +1,6 @@
 import pytest
 
-from fbchat.models import Poll, PollOption, ThreadType
+from fbchat import Poll, PollOption, ThreadType
 from utils import random_hex, subset
 
 

tests/test_search.py

@@ -1,4 +1,4 @@
-from fbchat.models import ThreadType
+from fbchat import ThreadType
 
 
 def test_search_for(client1):

tests/test_send.py

@@ -1,7 +1,7 @@
 import pytest
 
 from os import path
-from fbchat.models import FBchatFacebookError, Message, Mention
+from fbchat import FBchatFacebookError, Message, Mention
 from utils import subset, STICKER_LIST, EMOJI_LIST, TEXT_LIST
 
 

tests/test_thread_interraction.py

@@ -1,12 +1,6 @@
 import pytest
 
-from fbchat.models import (
-    Message,
-    ThreadType,
-    FBchatFacebookError,
-    TypingStatus,
-    ThreadColor,
-)
+from fbchat import Message, ThreadType, FBchatFacebookError, TypingStatus, ThreadColor
 from utils import random_hex, subset
 from os import path
 

tests/utils.py

@@ -5,8 +5,7 @@ import pytest
 from os import environ
 from random import randrange
 from contextlib import contextmanager
-from fbchat import Client
-from fbchat.models import ThreadType, EmojiSize, FBchatFacebookError, Sticker
+from fbchat import ThreadType, EmojiSize, FBchatFacebookError, Sticker, Client
 
 log = logging.getLogger("fbchat.tests").addHandler(logging.NullHandler())