Do not export tweet_factory & factor MediaParser

tests/conftest.py

@@ -5,7 +5,7 @@ from click.testing import CliRunner
 from bs4 import BeautifulSoup
 
 from twhatter.exploration import NodeTimeline
-from twhatter.parser import tweet_factory
+from twhatter.parser.tweet import tweet_factory
 from typing import NamedTuple, List
 
 from twhatter.parser.media import MediaBase

twhatter/parser/__init__.py

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

twhatter/parser/media.py

@@ -68,20 +68,7 @@ class ParserMedia(ParserBase):
         self.soup = soup
 
     def __iter__(self):
-        kwargs = {
-            f.name: MediaBase._extract_value(self.soup, f) for f in fields(MediaBase)
-        }
-
-        for kls in MediaBase.__subclasses__():
-            try:
-                if kls.condition(kwargs):
-                    m = kls(soup=self.soup, **kwargs)
-                    logger.debug("Parsed media {}".format(m))
-                    return m
-            except NotImplementedError:
-                continue
-
-        return None
+        return media_factory(self.soup)
 
     def __len__(self):
         return 1