From 1be02fc29c5102ad49f83f542e9be86d45a1e570 Mon Sep 17 00:00:00 2001 From: Alexandru Fikl Date: Sun, 30 Apr 2023 14:12:34 +0300 Subject: [PATCH 1/2] remove usage of deprecared sre_constants --- nvchecker_source/httpheader.py | 3 +-- nvchecker_source/regex.py | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/nvchecker_source/httpheader.py b/nvchecker_source/httpheader.py index 57feb46..c7e2368 100644 --- a/nvchecker_source/httpheader.py +++ b/nvchecker_source/httpheader.py @@ -2,7 +2,6 @@ # Copyright (c) 2021 lilydjwg , et al. import re -import sre_constants from nvchecker.api import session, GetVersionError @@ -19,7 +18,7 @@ async def get_version_impl(info): try: regex = re.compile(conf['regex']) - except sre_constants.error as e: + except re.error as e: raise GetVersionError('bad regex', exc_info=e) res = await session.request( diff --git a/nvchecker_source/regex.py b/nvchecker_source/regex.py index 828eaf5..ba21a35 100644 --- a/nvchecker_source/regex.py +++ b/nvchecker_source/regex.py @@ -2,14 +2,13 @@ # Copyright (c) 2013-2020 lilydjwg , et al. import re -import sre_constants from nvchecker.api import session, GetVersionError async def get_version(name, conf, *, cache, **kwargs): try: regex = re.compile(conf['regex']) - except sre_constants.error as e: + except re.error as e: raise GetVersionError('bad regex', exc_info=e) if regex.groups > 1: raise GetVersionError('multi-group regex') From fed4fc52ff3e7ce51093b6a391abd720494b92e8 Mon Sep 17 00:00:00 2001 From: Alexandru Fikl Date: Mon, 1 May 2023 09:59:16 +0300 Subject: [PATCH 2/2] test_cran: bump xml2 version to pass test --- tests/test_cran.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_cran.py b/tests/test_cran.py index c3328f1..17f7950 100644 --- a/tests/test_cran.py +++ b/tests/test_cran.py @@ -7,4 +7,4 @@ pytestmark = [pytest.mark.asyncio, pytest.mark.needs_net] async def test_cran(get_version): assert await get_version("xml2", { "source": "cran", - }) == "1.3.3" + }) == "1.3.4"