From 3639b565a7b8d50bc689f548a4e5aac33f3a6ef9 Mon Sep 17 00:00:00 2001 From: lduchosal Date: Tue, 27 Dec 2022 13:31:17 +0100 Subject: [PATCH 1/2] Fix: import aiostream only if sys.version < python 3.9 --- tests/storage/__init__.py | 4 +++- tests/storage/conftest.py | 4 +++- tests/storage/dav/__init__.py | 4 +++- tests/storage/dav/test_caldav.py | 4 +++- tests/storage/test_filesystem.py | 4 +++- tests/storage/test_http_with_singlefile.py | 4 +++- tests/unit/cli/test_discover.py | 4 +++- tests/unit/sync/test_sync.py | 4 +++- tests/unit/test_repair.py | 4 +++- vdirsyncer/cli/discover.py | 4 +++- vdirsyncer/repair.py | 4 +++- vdirsyncer/storage/dav.py | 4 +++- 12 files changed, 36 insertions(+), 12 deletions(-) diff --git a/tests/storage/__init__.py b/tests/storage/__init__.py index ea508b630..8ccf3778a 100644 --- a/tests/storage/__init__.py +++ b/tests/storage/__init__.py @@ -4,7 +4,9 @@ from urllib.parse import quote as urlquote from urllib.parse import unquote as urlunquote -import aiostream +import sys +if sys.version_info < (3,9): + import aiostream import pytest import pytest_asyncio diff --git a/tests/storage/conftest.py b/tests/storage/conftest.py index 76fe8d371..3367f5aec 100644 --- a/tests/storage/conftest.py +++ b/tests/storage/conftest.py @@ -5,7 +5,9 @@ import uuid from typing import Type -import aiostream +import sys +if sys.version_info < (3,9): + import aiostream import pytest import pytest_asyncio import requests diff --git a/tests/storage/dav/__init__.py b/tests/storage/dav/__init__.py index b97b2cc9b..2bdd5f146 100644 --- a/tests/storage/dav/__init__.py +++ b/tests/storage/dav/__init__.py @@ -2,7 +2,9 @@ import uuid import aiohttp -import aiostream +import sys +if sys.version_info < (3,9): + import aiostream import pytest from tests import assert_item_equals diff --git a/tests/storage/dav/test_caldav.py b/tests/storage/dav/test_caldav.py index e68d09b01..e003fe041 100644 --- a/tests/storage/dav/test_caldav.py +++ b/tests/storage/dav/test_caldav.py @@ -2,7 +2,9 @@ from textwrap import dedent import aiohttp -import aiostream +import sys +if sys.version_info < (3,9): + import aiostream import pytest from aioresponses import aioresponses diff --git a/tests/storage/test_filesystem.py b/tests/storage/test_filesystem.py index fb90bddf1..07bd2f346 100644 --- a/tests/storage/test_filesystem.py +++ b/tests/storage/test_filesystem.py @@ -1,6 +1,8 @@ import subprocess -import aiostream +import sys +if sys.version_info < (3,9): + import aiostream import pytest from vdirsyncer.storage.filesystem import FilesystemStorage diff --git a/tests/storage/test_http_with_singlefile.py b/tests/storage/test_http_with_singlefile.py index 7f671d74a..2f8313cf3 100644 --- a/tests/storage/test_http_with_singlefile.py +++ b/tests/storage/test_http_with_singlefile.py @@ -1,4 +1,6 @@ -import aiostream +import sys +if sys.version_info < (3,9): + import aiostream import pytest from aioresponses import CallbackResult from aioresponses import aioresponses diff --git a/tests/unit/cli/test_discover.py b/tests/unit/cli/test_discover.py index 4c24a3878..da8854b1f 100644 --- a/tests/unit/cli/test_discover.py +++ b/tests/unit/cli/test_discover.py @@ -1,4 +1,6 @@ -import aiostream +import sys +if sys.version_info < (3,9): + import aiostream import pytest from vdirsyncer.cli.discover import expand_collections diff --git a/tests/unit/sync/test_sync.py b/tests/unit/sync/test_sync.py index 84db2faa4..8825edf40 100644 --- a/tests/unit/sync/test_sync.py +++ b/tests/unit/sync/test_sync.py @@ -1,7 +1,9 @@ import asyncio from copy import deepcopy -import aiostream +import sys +if sys.version_info < (3,9): + import aiostream import hypothesis.strategies as st import pytest from hypothesis import assume diff --git a/tests/unit/test_repair.py b/tests/unit/test_repair.py index 3a153bca7..df4541de1 100644 --- a/tests/unit/test_repair.py +++ b/tests/unit/test_repair.py @@ -1,4 +1,6 @@ -import aiostream +import sys +if sys.version_info < (3,9): + import aiostream import pytest from hypothesis import HealthCheck from hypothesis import given diff --git a/vdirsyncer/cli/discover.py b/vdirsyncer/cli/discover.py index c28af1413..9fc218eeb 100644 --- a/vdirsyncer/cli/discover.py +++ b/vdirsyncer/cli/discover.py @@ -5,7 +5,9 @@ import sys import aiohttp -import aiostream +import sys +if sys.version_info < (3,9): + import aiostream from .. import exceptions from .utils import handle_collection_not_found diff --git a/vdirsyncer/repair.py b/vdirsyncer/repair.py index d3e48dcce..a1f7ee5fd 100644 --- a/vdirsyncer/repair.py +++ b/vdirsyncer/repair.py @@ -1,7 +1,9 @@ import logging from os.path import basename -import aiostream +import sys +if sys.version_info < (3,9): + import aiostream from .utils import generate_href from .utils import href_safe diff --git a/vdirsyncer/storage/dav.py b/vdirsyncer/storage/dav.py index 727f685e9..985a9c400 100644 --- a/vdirsyncer/storage/dav.py +++ b/vdirsyncer/storage/dav.py @@ -9,7 +9,9 @@ from typing import Type import aiohttp -import aiostream +import sys +if sys.version_info < (3,9): + import aiostream from vdirsyncer.exceptions import Error from vdirsyncer.vobject import Item From 74161079f54a57103591de9a1b32112553b168ab Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 27 Dec 2022 12:33:07 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- tests/storage/__init__.py | 5 +++-- tests/storage/conftest.py | 5 +++-- tests/storage/dav/__init__.py | 6 ++++-- tests/storage/dav/test_caldav.py | 6 ++++-- tests/storage/test_filesystem.py | 5 +++-- tests/storage/test_http_with_singlefile.py | 3 ++- tests/unit/cli/test_discover.py | 3 ++- tests/unit/sync/test_sync.py | 5 +++-- tests/unit/test_repair.py | 3 ++- vdirsyncer/cli/discover.py | 4 ++-- vdirsyncer/repair.py | 4 ++-- vdirsyncer/storage/dav.py | 5 +++-- 12 files changed, 33 insertions(+), 21 deletions(-) diff --git a/tests/storage/__init__.py b/tests/storage/__init__.py index 8ccf3778a..3839e4095 100644 --- a/tests/storage/__init__.py +++ b/tests/storage/__init__.py @@ -1,12 +1,13 @@ import random +import sys import textwrap import uuid from urllib.parse import quote as urlquote from urllib.parse import unquote as urlunquote -import sys -if sys.version_info < (3,9): +if sys.version_info < (3, 9): import aiostream + import pytest import pytest_asyncio diff --git a/tests/storage/conftest.py b/tests/storage/conftest.py index 3367f5aec..b1a0c49e1 100644 --- a/tests/storage/conftest.py +++ b/tests/storage/conftest.py @@ -1,13 +1,14 @@ import asyncio import contextlib import subprocess +import sys import time import uuid from typing import Type -import sys -if sys.version_info < (3,9): +if sys.version_info < (3, 9): import aiostream + import pytest import pytest_asyncio import requests diff --git a/tests/storage/dav/__init__.py b/tests/storage/dav/__init__.py index 2bdd5f146..8968d63c0 100644 --- a/tests/storage/dav/__init__.py +++ b/tests/storage/dav/__init__.py @@ -1,10 +1,12 @@ import os +import sys import uuid import aiohttp -import sys -if sys.version_info < (3,9): + +if sys.version_info < (3, 9): import aiostream + import pytest from tests import assert_item_equals diff --git a/tests/storage/dav/test_caldav.py b/tests/storage/dav/test_caldav.py index e003fe041..966cc7e31 100644 --- a/tests/storage/dav/test_caldav.py +++ b/tests/storage/dav/test_caldav.py @@ -1,10 +1,12 @@ import datetime +import sys from textwrap import dedent import aiohttp -import sys -if sys.version_info < (3,9): + +if sys.version_info < (3, 9): import aiostream + import pytest from aioresponses import aioresponses diff --git a/tests/storage/test_filesystem.py b/tests/storage/test_filesystem.py index 07bd2f346..1df720ab5 100644 --- a/tests/storage/test_filesystem.py +++ b/tests/storage/test_filesystem.py @@ -1,8 +1,9 @@ import subprocess - import sys -if sys.version_info < (3,9): + +if sys.version_info < (3, 9): import aiostream + import pytest from vdirsyncer.storage.filesystem import FilesystemStorage diff --git a/tests/storage/test_http_with_singlefile.py b/tests/storage/test_http_with_singlefile.py index 2f8313cf3..74e668865 100644 --- a/tests/storage/test_http_with_singlefile.py +++ b/tests/storage/test_http_with_singlefile.py @@ -1,5 +1,6 @@ import sys -if sys.version_info < (3,9): + +if sys.version_info < (3, 9): import aiostream import pytest from aioresponses import CallbackResult diff --git a/tests/unit/cli/test_discover.py b/tests/unit/cli/test_discover.py index da8854b1f..2af6cc452 100644 --- a/tests/unit/cli/test_discover.py +++ b/tests/unit/cli/test_discover.py @@ -1,5 +1,6 @@ import sys -if sys.version_info < (3,9): + +if sys.version_info < (3, 9): import aiostream import pytest diff --git a/tests/unit/sync/test_sync.py b/tests/unit/sync/test_sync.py index 8825edf40..5c814b37a 100644 --- a/tests/unit/sync/test_sync.py +++ b/tests/unit/sync/test_sync.py @@ -1,9 +1,10 @@ import asyncio +import sys from copy import deepcopy -import sys -if sys.version_info < (3,9): +if sys.version_info < (3, 9): import aiostream + import hypothesis.strategies as st import pytest from hypothesis import assume diff --git a/tests/unit/test_repair.py b/tests/unit/test_repair.py index df4541de1..bec7eac4c 100644 --- a/tests/unit/test_repair.py +++ b/tests/unit/test_repair.py @@ -1,5 +1,6 @@ import sys -if sys.version_info < (3,9): + +if sys.version_info < (3, 9): import aiostream import pytest from hypothesis import HealthCheck diff --git a/vdirsyncer/cli/discover.py b/vdirsyncer/cli/discover.py index 9fc218eeb..c1a7d0910 100644 --- a/vdirsyncer/cli/discover.py +++ b/vdirsyncer/cli/discover.py @@ -5,8 +5,8 @@ import sys import aiohttp -import sys -if sys.version_info < (3,9): + +if sys.version_info < (3, 9): import aiostream from .. import exceptions diff --git a/vdirsyncer/repair.py b/vdirsyncer/repair.py index a1f7ee5fd..503a4c3a8 100644 --- a/vdirsyncer/repair.py +++ b/vdirsyncer/repair.py @@ -1,8 +1,8 @@ import logging +import sys from os.path import basename -import sys -if sys.version_info < (3,9): +if sys.version_info < (3, 9): import aiostream from .utils import generate_href diff --git a/vdirsyncer/storage/dav.py b/vdirsyncer/storage/dav.py index 985a9c400..4c2f46dfc 100644 --- a/vdirsyncer/storage/dav.py +++ b/vdirsyncer/storage/dav.py @@ -1,5 +1,6 @@ import datetime import logging +import sys import urllib.parse as urlparse import xml.etree.ElementTree as etree from abc import abstractmethod @@ -9,8 +10,8 @@ from typing import Type import aiohttp -import sys -if sys.version_info < (3,9): + +if sys.version_info < (3, 9): import aiostream from vdirsyncer.exceptions import Error