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 ea508b63..8ccf3778 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 76fe8d37..3367f5ae 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 b97b2cc9..2bdd5f14 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 e68d09b0..e003fe04 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 fb90bddf..07bd2f34 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 7f671d74..2f8313cf 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 4c24a387..da8854b1 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 84db2faa..8825edf4 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 3a153bca..df4541de 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 c28af141..9fc218ee 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 d3e48dcc..a1f7ee5f 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 727f685e..985a9c40 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 8ccf3778..3839e409 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 3367f5ae..b1a0c49e 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 2bdd5f14..8968d63c 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 e003fe04..966cc7e3 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 07bd2f34..1df720ab 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 2f8313cf..74e66886 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 da8854b1..2af6cc45 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 8825edf4..5c814b37 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 df4541de..bec7eac4 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 9fc218ee..c1a7d091 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 a1f7ee5f..503a4c3a 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 985a9c40..4c2f46df 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