From 5ef2fa115d2551bc8ae37488d8220e5f90165d70 Mon Sep 17 00:00:00 2001 From: "Jens W. Klein" Date: Sat, 9 Dec 2023 18:40:37 +0100 Subject: [PATCH] use typing for py before 3.10 --- src/mxdev/config.py | 2 +- src/mxdev/including.py | 6 ++++-- src/mxdev/tests/test_including.py | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/mxdev/config.py b/src/mxdev/config.py index 4d29d25..43d4f70 100644 --- a/src/mxdev/config.py +++ b/src/mxdev/config.py @@ -1,5 +1,5 @@ -from .logging import logger from .including import read_with_included +from .logging import logger import os import pkg_resources diff --git a/src/mxdev/including.py b/src/mxdev/including.py index e515c01..d0cac90 100644 --- a/src/mxdev/including.py +++ b/src/mxdev/including.py @@ -3,12 +3,14 @@ from urllib import parse from urllib import request +import os import pathlib import tempfile -import os +import typing + def resolve_dependencies( - file_or_url: str | pathlib.Path, + file_or_url: typing.Union[str, pathlib.Path], tmpdir: tempfile.TemporaryDirectory, http_parent=None, ) -> list[pathlib.Path]: diff --git a/src/mxdev/tests/test_including.py b/src/mxdev/tests/test_including.py index de351a2..ae95bf3 100644 --- a/src/mxdev/tests/test_including.py +++ b/src/mxdev/tests/test_including.py @@ -43,6 +43,7 @@ def test_resolve_dependencies_filenotfound(tmp_path): with pytest.raises(FileNotFoundError): resolve_dependencies(base / "file__not_found.ini", tmp_path) + def test_read_with_included(): from mxdev.including import read_with_included @@ -53,4 +54,3 @@ def test_read_with_included(): assert cfg["settings"]["unique_2"] == "2" assert cfg["settings"]["unique_3"] == "3" assert cfg["settings"]["unique_4"] == "4" -