Revert "Drafting infer_scraper_function_is_singular"

This reverts commit e795223.

Author: Yomguithereal

minet/scrape/analysis.py

@@ -4,8 +4,8 @@
 #
 # Functions performing analysis of scraper definitions.
 #
-from typing import Optional, List, Callable, Iterable, Iterator, Generator
-from minet.types import Literal, get_type_hints
+from typing import Optional, List
+from minet.types import Literal
 
 import ast
 import soupsieve
@@ -113,32 +113,6 @@ def analyse(scraper):
     return analysis
 
 
-NoneType = type(None)
-
-# TODO: what about singular tuples and lists?
-PluralTypes = (list, frozenset, set, tuple, Iterator, Iterable, Generator)
-
-
-def infer_scraper_return_type_is_singular(t) -> bool:
-    # NOTE: we default to plural
-    return False
-
-
-def infer_scraper_function_is_singular(fn: Callable) -> bool:
-    if not callable(fn):
-        raise TypeError("expecting a function")
-
-    hints = get_type_hints(fn)
-    return_type = hints.get("return")
-
-    if return_type is None:
-        return False
-
-    # TODO: handle unions
-
-    return infer_scraper_return_type_is_singular(return_type)
-
-
 ERRORS_PRIORITY = {
     InvalidCSSSelectorError: 0,
     ScraperValidationUnknownKeyError: 1,

minet/types.py

@@ -2,14 +2,15 @@
 from typing import Union, List, Optional
 from os import PathLike
 from io import FileIO
+from bs4 import BeautifulSoup
 from urllib3 import Timeout
 from ebbe import format_repr
 
 # NOTE: yes this is repetitive, but mypy only understands this, don't ask questions...
 if sys.version_info >= (3, 8):
-    from typing import Literal, get_type_hints, get_origin, get_args
+    from typing import Literal
 else:
-    from typing_extensions import Literal, get_type_hints, get_origin, get_args
+    from typing_extensions import Literal
 
 if sys.version_info >= (3, 10):
     from typing import TypeGuard, Concatenate, ParamSpec

test/scraper_test.py

@@ -8,7 +8,6 @@
 from minet.scrape import scrape, Scraper
 from minet.scrape.analysis import (
     fieldnames_from_definition,
-    infer_scraper_function_is_singular,
     validate,
     analyse,
     ScraperAnalysis,
@@ -549,12 +548,6 @@ def test_analysis(self):
             plural=True, fieldnames=["url", "title"], output_type="collection"
         )
 
-    def test_singular_inference(self):
-        def scraper(row, soup) -> str:
-            return ""
-
-        infer_scraper_function_is_singular(scraper)
-
     def test_absent_tail_call(self):
         item = scrape({"sel": "quote", "fields": {"url": "href"}}, BASIC_HTML)