theenglishway (time) 7 лет назад
Родитель
Сommit
caae91a42c
3 измененных файлов с 4 добавлено и 22 удалено
  1. 3 3
      tests/test_parser.py
  2. 1 2
      twhatter/parser/__init__.py
  3. 0 17
      twhatter/parser/tweet.py

+ 3 - 3
tests/test_parser.py

@@ -2,13 +2,13 @@ import pytest
 from twhatter.parser import *
 
 
-class TestTweetList:
+class TestTweetParser:
     def test_len(self, raw_html_user_initial_page):
-        t_list = TweetList(raw_html_user_initial_page)
+        t_list = ParserTweet(raw_html_user_initial_page)
         assert len(t_list) == 20
 
     def test_iter(self, raw_html_user_initial_page):
-        t_list = TweetList(raw_html_user_initial_page)
+        t_list = ParserTweet(raw_html_user_initial_page)
         for t in t_list:
             assert isinstance(t, TweetBase)
 

+ 1 - 2
twhatter/parser/__init__.py

@@ -1,11 +1,10 @@
-from .tweet import (TweetList, TweetBase, ParserTweet,
+from .tweet import (TweetBase, ParserTweet,
                     tweet_factory,
                     TweetTextOnly, TweetLink, TweetReaction, TweetRetweet,)
 from .user import User, ParserUser
 from .media import MediaBase, MediaImage, media_factory, ParserMedia
 
 __all__= [
-    "TweetList",
     "TweetBase",
     "tweet_factory",
     "TweetTextOnly",

+ 0 - 17
twhatter/parser/tweet.py

@@ -258,23 +258,6 @@ def tweet_factory(soup: BeautifulSoup) -> TweetBase:
         return TweetTextOnly(soup=soup, **kwargs)
 
 
-class TweetList:
-    def __init__(self, soup):
-        self.raw_tweets = soup.find_all('li', 'stream-item')
-
-    def __iter__(self):
-        for tweet in self.raw_tweets:
-            # Don't know what this u-dir stuff is about but if it's in there,
-            # it's not a tweet !
-            if not tweet.find_all('p', class_="u-dir"):
-                t = tweet_factory(tweet)
-                logger.debug("Parsed tweet {}".format(t))
-                yield t
-
-    def __len__(self):
-        return len(self.raw_tweets)
-
-
 class ParserTweet(ParserBase):
     def __init__(self, soup):
         super().__init__(soup)