make PYTHON workaround uniform

This commit is contained in:
scito
2023-01-01 17:25:24 +01:00
parent 67c4f737c4
commit a3bda6ff8e
5 changed files with 18 additions and 17 deletions

View File

@@ -18,7 +18,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.
from __future__ import annotations # for compatibility with PYTHON < 3.11
from __future__ import annotations # workaround for PYTHON <= 3.10
import unittest
import extract_otp_secrets

View File

@@ -18,7 +18,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.
from __future__ import annotations # for compatibility with PYTHON < 3.11
from __future__ import annotations # workaround for PYTHON <= 3.10
import io
import os
import pathlib
@@ -356,6 +356,7 @@ def test_normalize_bytes() -> None:
# Generate verbose output: python3.11 src/extract_otp_secrets.py example_export.txt -v -n > tests/data/print_verbose_output.txt
# workaround for PYTHON <= 3.10
@pytest.mark.skipif(sys.version_info < (3, 10), reason="fileinput.input encoding exists since PYTHON 3.10")
def test_extract_verbose(capsys: pytest.CaptureFixture[str], relaxed: bool) -> None:
# Act

View File

@@ -18,7 +18,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.
from __future__ import annotations # for compatibility with PYTHON < 3.11
from __future__ import annotations # workaround for PYTHON <= 3.10
import io
import os
import sys

View File

@@ -13,7 +13,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.
from __future__ import annotations # for compatibility with PYTHON < 3.11
from __future__ import annotations # workaround for PYTHON <= 3.10
import csv
import glob
import io
@@ -27,12 +27,12 @@ from typing import BinaryIO, Any, Union, List
# Types
# PYTHON < 3.10: Workaround for str | pathlib.Path
# workaround for PYTHON <= 3.9: Workaround for str | pathlib.Path
PathLike = Union[str, pathlib.Path]
# Ref. https://stackoverflow.com/a/16571630
# PYTHON 3.11: class Capturing(list[Any]):
# workaround for PYTHON <= 3.10: class Capturing(list[Any]):
class Capturing(List[Any]):
'''Capture stdout and stderr
Usage: