From 172a9e0f8aeb6d38dd819091312419d361151e5c Mon Sep 17 00:00:00 2001 From: Junhao Liao Date: Sat, 20 Apr 2024 01:39:33 -0400 Subject: [PATCH] Reformat code; add backports.zoneinfo for Python version < 3.9. --- pyproject.toml | 1 + src/clp_logging/handlers.py | 1 - src/clp_logging/readers.py | 5 ++++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 760f436..77c719a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -13,6 +13,7 @@ description = "Logging/encoding/decoding using CLP's IR stream format" readme = "README.md" requires-python = ">=3.6" dependencies = [ + "backports.zoneinfo >= 0.2.1; python_version<'3.9'", "clp-ffi-py >= 0.0.9", "typing-extensions >= 3.7.4", "tzlocal >= 5.2", diff --git a/src/clp_logging/handlers.py b/src/clp_logging/handlers.py index 0ae6673..2bec627 100644 --- a/src/clp_logging/handlers.py +++ b/src/clp_logging/handlers.py @@ -4,7 +4,6 @@ import sys import time from abc import ABCMeta, abstractmethod -from datetime import tzinfo from math import floor from pathlib import Path from queue import Empty, Queue diff --git a/src/clp_logging/readers.py b/src/clp_logging/readers.py index df9f21d..7b8ecf5 100644 --- a/src/clp_logging/readers.py +++ b/src/clp_logging/readers.py @@ -4,7 +4,6 @@ from sys import stderr from types import TracebackType from typing import IO, Iterator, List, Match, Optional, Tuple, Type, Union -from zoneinfo import ZoneInfo from clp_ffi_py.ir import FourByteEncoder from zstandard import ZstdDecompressionReader, ZstdDecompressor @@ -31,6 +30,10 @@ VAR_COMPACT_ENCODING, ) +try: + from zoneinfo import ZoneInfo +except ImportError: + from backports.zoneinfo import ZoneInfo class Log: """