refactor: improve backports imports

This commit is contained in:
jo 2022-12-07 14:39:23 +01:00 committed by Kyle Robbertze
parent 6e27003409
commit cfa90c89d1
2 changed files with 9 additions and 6 deletions

View File

@ -4,6 +4,7 @@ import math
import os import os
import re import re
import signal import signal
import sys
import time import time
from datetime import timezone from datetime import timezone
from subprocess import PIPE, Popen from subprocess import PIPE, Popen
@ -15,10 +16,10 @@ from loguru import logger
from libretime_playout.config import PUSH_INTERVAL, RECORD_DIR, Config from libretime_playout.config import PUSH_INTERVAL, RECORD_DIR, Config
try: if sys.version_info < (3, 9):
from zoneinfo import ZoneInfo
except ImportError:
from backports.zoneinfo import ZoneInfo from backports.zoneinfo import ZoneInfo
else:
from zoneinfo import ZoneInfo
# TODO : add docstrings everywhere in this module # TODO : add docstrings everywhere in this module

View File

@ -1,3 +1,4 @@
import sys
from enum import Enum from enum import Enum
from typing import TYPE_CHECKING, Any, List, Optional, Sequence, Union from typing import TYPE_CHECKING, Any, List, Optional, Sequence, Union
@ -5,10 +6,11 @@ from typing import TYPE_CHECKING, Any, List, Optional, Sequence, Union
from pydantic import AnyHttpUrl, AnyUrl, BaseModel, Field, validator from pydantic import AnyHttpUrl, AnyUrl, BaseModel, Field, validator
from typing_extensions import Annotated, Literal from typing_extensions import Annotated, Literal
try: if sys.version_info < (3, 9):
from backports.zoneinfo import ZoneInfo, ZoneInfoNotFoundError
else:
from zoneinfo import ZoneInfo, ZoneInfoNotFoundError from zoneinfo import ZoneInfo, ZoneInfoNotFoundError
except ImportError:
from backports.zoneinfo import ZoneInfo, ZoneInfoNotFoundError # type: ignore
if TYPE_CHECKING: if TYPE_CHECKING:
from pydantic.typing import AnyClassMethod from pydantic.typing import AnyClassMethod