From d6348d55752f946a4d3815773d7c7ef90310c00f Mon Sep 17 00:00:00 2001 From: jo Date: Thu, 1 Sep 2022 16:18:21 +0200 Subject: [PATCH] fix(playout): py36 compatibility broken typings This partially reverts commit 5505222df632ff8f311d19056db0619501b083cf. --- playout/libretime_playout/main.py | 10 +++++----- playout/libretime_playout/message_handler.py | 5 ++--- playout/libretime_playout/player/fetch.py | 7 +++---- playout/libretime_playout/player/file.py | 3 +-- playout/libretime_playout/player/push.py | 5 ++--- playout/libretime_playout/player/queue.py | 3 +-- 6 files changed, 14 insertions(+), 19 deletions(-) diff --git a/playout/libretime_playout/main.py b/playout/libretime_playout/main.py index 7d52eea65..d46ef9245 100644 --- a/playout/libretime_playout/main.py +++ b/playout/libretime_playout/main.py @@ -8,7 +8,7 @@ import time from datetime import datetime from pathlib import Path from queue import Queue -from typing import Any, Dict, Optional +from typing import Optional import click from libretime_api_client.v1 import ApiClient as LegacyClient @@ -93,14 +93,14 @@ def cli(log_level: str, log_filepath: Optional[Path], config_filepath: Optional[ if not LIQUIDSOAP_MIN_VERSION <= liq_version: raise Exception(f"Invalid liquidsoap version {liq_version}") - fetch_queue: Queue[Dict[str, Any]] = Queue() - recorder_queue: Queue[Dict[str, Any]] = Queue() - push_queue: Queue[Dict[str, Any]] = Queue() + fetch_queue = Queue() + recorder_queue = Queue() + push_queue = Queue() # This queue is shared between pypo-fetch and pypo-file, where pypo-file # is the consumer. Pypo-fetch will send every schedule it gets to pypo-file # and pypo will parse this schedule to determine which file has the highest # priority, and retrieve it. - file_queue: Queue[Dict[str, Any]] = Queue() + file_queue = Queue() pypo_liquidsoap = PypoLiquidsoap(liq_client) diff --git a/playout/libretime_playout/message_handler.py b/playout/libretime_playout/message_handler.py index f657ed7bd..a80dd7f2b 100644 --- a/playout/libretime_playout/message_handler.py +++ b/playout/libretime_playout/message_handler.py @@ -2,7 +2,6 @@ import json import time from queue import Queue as ThreadQueue from threading import Thread -from typing import Any, Dict # For RabbitMQ from kombu.connection import Connection @@ -33,8 +32,8 @@ class PypoMessageHandler(Thread): def __init__( self, - fetch_queue: ThreadQueue[Dict[str, Any]], - recorder_queue: ThreadQueue[Dict[str, Any]], + fetch_queue: ThreadQueue, + recorder_queue: ThreadQueue, config: RabbitMQConfig, ): Thread.__init__(self) diff --git a/playout/libretime_playout/player/fetch.py b/playout/libretime_playout/player/fetch.py index e3e58a9d6..c532fb5a8 100644 --- a/playout/libretime_playout/player/fetch.py +++ b/playout/libretime_playout/player/fetch.py @@ -9,7 +9,6 @@ from datetime import datetime from queue import Empty, Queue from subprocess import PIPE, Popen from threading import Thread, Timer -from typing import Any, Dict from libretime_api_client.v1 import ApiClient as LegacyClient from libretime_api_client.v2 import ApiClient @@ -35,9 +34,9 @@ class PypoFetch(Thread): def __init__( self, - fetch_queue: Queue[Dict[str, Any]], - push_queue: Queue[Dict[str, Any]], - file_queue: Queue[Dict[str, Any]], + fetch_queue: Queue, + push_queue: Queue, + file_queue: Queue, liq_client: LiquidsoapClient, pypo_liquidsoap: PypoLiquidsoap, config: Config, diff --git a/playout/libretime_playout/player/file.py b/playout/libretime_playout/player/file.py index f7d1d2726..1d25079fb 100644 --- a/playout/libretime_playout/player/file.py +++ b/playout/libretime_playout/player/file.py @@ -4,7 +4,6 @@ import stat import time from queue import Empty, Queue from threading import Thread -from typing import Any, Dict from libretime_api_client.v2 import ApiClient from loguru import logger @@ -16,7 +15,7 @@ class PypoFile(Thread): def __init__( self, - file_queue: Queue[Dict[str, Any]], + file_queue: Queue, api_client: ApiClient, ): Thread.__init__(self) diff --git a/playout/libretime_playout/player/push.py b/playout/libretime_playout/player/push.py index cc1f6255f..b55413ba2 100644 --- a/playout/libretime_playout/player/push.py +++ b/playout/libretime_playout/player/push.py @@ -3,7 +3,6 @@ import time from datetime import datetime from queue import Queue from threading import Thread -from typing import Any, Dict from loguru import logger @@ -25,7 +24,7 @@ class PypoPush(Thread): def __init__( self, - push_queue: Queue[Dict[str, Any]], + push_queue: Queue, pypo_liquidsoap: PypoLiquidsoap, config: Config, ): @@ -38,7 +37,7 @@ class PypoPush(Thread): self.current_prebuffering_stream_id = None self.queue_id = 0 - self.future_scheduled_queue: Queue[Dict[str, Any]] = Queue() + self.future_scheduled_queue = Queue() self.pypo_liquidsoap = pypo_liquidsoap self.plq = PypoLiqQueue(self.future_scheduled_queue, self.pypo_liquidsoap) diff --git a/playout/libretime_playout/player/queue.py b/playout/libretime_playout/player/queue.py index 704f70cf8..95736c9c2 100644 --- a/playout/libretime_playout/player/queue.py +++ b/playout/libretime_playout/player/queue.py @@ -4,7 +4,6 @@ from collections import deque from datetime import datetime from queue import Empty, Queue from threading import Thread -from typing import Any, Dict from loguru import logger @@ -25,7 +24,7 @@ class PypoLiqQueue(Thread): def __init__( self, - future_queue: Queue[Dict[str, Any]], + future_queue: Queue, pypo_liquidsoap: PypoLiquidsoap, ): Thread.__init__(self)