Fixing minet.__future__ not being a proper module

medialab · Nov 2, 2023 · 5baf4e0 · 5baf4e0
1 parent 3c26e8b
commit 5baf4e0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/hooks/hook-minet.cli.py b/hooks/hook-minet.cli.py
@@ -1,3 +1,5 @@
+from typing import List, Tuple
+
 import re
 import playwright_stealth
 import trafilatura
@@ -8,7 +10,7 @@
 
 SLASH_RE = re.compile(r"[\/\\]")
 
-hiddenimports = []
+hiddenimports = ["minet.__future__", "mine.__future__.threaded_child_watcher"]
 
 for p in iglob("minet/cli/**/*.py", recursive=True):
     if "__main__" in p:
@@ -24,7 +26,7 @@
 hiddenimports.extend(collect_submodules("pkg_resources"))
 hiddenimports.append("charset_normalizer.md__mypyc")
 
-datas = [
+datas: List[Tuple[str, str]] = [
     (join(dirname(trafilatura.__file__), "settings.cfg"), "trafilatura"),
 ]
 

diff --git a/minet/__future__/__init__.py b/minet/__future__/__init__.py
diff --git a/minet/browser/threadsafe_browser.py b/minet/browser/threadsafe_browser.py
@@ -9,7 +9,6 @@
 from threading import Thread, Event, Lock
 from playwright.async_api import async_playwright, Browser, BrowserContext
 
-from minet.__future__.threaded_child_watcher import ThreadedChildWatcher
 from minet.exceptions import UnknownBrowserError
 from minet.browser.plawright_shim import install_browser
 from minet.browser.utils import get_browsers_path, get_temp_persistent_context_path
@@ -70,6 +69,8 @@ def __init__(
         # NOTE: on unix python 3.7, child watching does not
         # work properly when asyncio is not running from the main thread
         if UNIX and LTE_PY37:
+            from minet.__future__.threaded_child_watcher import ThreadedChildWatcher
+
             asyncio.set_child_watcher(ThreadedChildWatcher())
 
         self.browser_name: str = browser