- Restore python39-failures.patch, which is actually still needed.

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-aiohttp?expand=0&rev=70
This commit is contained in:
Matej Cepl 2021-09-10 14:23:03 +00:00 committed by Git OBS Bridge
parent 09aa0c6422
commit f541008472
3 changed files with 87 additions and 2 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Sep 10 14:22:31 UTC 2021 - Matej Cepl <mcepl@suse.com>
- Restore python39-failures.patch, which is actually still needed.
-------------------------------------------------------------------
Thu Sep 9 20:05:44 UTC 2021 - Matej Cepl <mcepl@suse.com>

View File

@ -29,12 +29,15 @@ Patch0: unbundle-http-parser.patch
# PATCH-FIX-UPSTREAM stdlib-typing_extensions.patch gh#aio-libs/aiohttp#5374 mcepl@suse.com
# Fix typing_extensions imports.
Patch1: stdlib-typing_extensions.patch
# PATCH-FIX-UPSTREAM python39-failures.patch gh#aio-libs/aiohttp#5991 mcepl@suse.com
# Bridge over Python 3.9.6 v 3.9.7 incompatibilities
Patch2: python39-failures.patch
# PATCH-FIX-UPSTREAM remove_deprecated_loop_argument.patch gh#aio-libs/aiohttp#5991 mcepl@suse.com
# remove deprecated loop argument
Patch2: remove_deprecated_loop_argument.patch
Patch3: remove_deprecated_loop_argument.patch
# PATCH-FIX-UPSTREAM backport_fix_for_setting_cookies.patch gh#aio-libs/aiohttp#5233 mcepl@suse.com
# backport of fixes from 3.8 branch
Patch3: backport_fix_for_setting_cookies.patch
Patch4: backport_fix_for_setting_cookies.patch
BuildRequires: %{python_module Cython}
BuildRequires: %{python_module async_timeout >= 3.0}
BuildRequires: %{python_module attrs >= 17.3.0}

77
python39-failures.patch Normal file
View File

@ -0,0 +1,77 @@
---
tests/test_web_middleware.py | 27 ++++++++++++++++++++++-----
1 file changed, 22 insertions(+), 5 deletions(-)
--- a/tests/test_web_middleware.py
+++ b/tests/test_web_middleware.py
@@ -1,4 +1,5 @@
import re
+import sys
from typing import Any
import pytest
@@ -6,6 +7,7 @@ from yarl import URL
from aiohttp import web
+py39 = sys.version_info[:3] >= (3, 9, 7)
async def test_middleware_modifies_response(loop, aiohttp_client) -> None:
async def handler(request):
@@ -410,7 +412,10 @@ async def test_old_style_middleware(loop
txt = await resp.text()
assert "OK[old style middleware]" == txt
- assert len(warning_checker) == 1
+ if py39:
+ assert len(warning_checker) == 2
+ else:
+ assert len(warning_checker) == 1
msg = str(warning_checker.list[0].message)
assert re.match(
"^old-style middleware "
@@ -464,7 +469,10 @@ async def test_mixed_middleware(loop, ai
txt = await resp.text()
assert "OK[new style 2][old style 2][new style 1][old style 1]" == txt
- assert len(w) == 2
+ if py39:
+ assert len(w) == 3
+ else:
+ assert len(w) == 2
tmpl = (
"^old-style middleware "
'"<function test_mixed_middleware.<locals>.'
@@ -503,7 +511,10 @@ async def test_old_style_middleware_clas
txt = await resp.text()
assert "OK[old style middleware]" == txt
- assert len(warning_checker) == 1
+ if py39:
+ assert len(warning_checker) == 2
+ else:
+ assert len(warning_checker) == 1
msg = str(warning_checker.list[0].message)
assert re.match(
"^old-style middleware "
@@ -537,7 +548,10 @@ async def test_new_style_middleware_clas
txt = await resp.text()
assert "OK[new style middleware]" == txt
- assert len(warning_checker) == 0
+ if py39:
+ assert len(warning_checker) == 1
+ else:
+ assert len(warning_checker) == 0
async def test_new_style_middleware_method(loop, aiohttp_client) -> None:
@@ -563,4 +577,7 @@ async def test_new_style_middleware_meth
txt = await resp.text()
assert "OK[new style middleware]" == txt
- assert len(warning_checker) == 0
+ if py39:
+ assert len(warning_checker) == 1
+ else:
+ assert len(warning_checker) == 0