diff --git a/python-Flask.changes b/python-Flask.changes index b339a9f..76fa2b3 100644 --- a/python-Flask.changes +++ b/python-Flask.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Nov 8 05:29:38 UTC 2019 - Steve Kowalik + +- Add python38-exception-test.patch to fix test failures under Python 3.8 + ------------------------------------------------------------------- Fri Jul 19 12:22:54 UTC 2019 - Tomáš Chvátal diff --git a/python-Flask.spec b/python-Flask.spec index 0c1f316..1b6fbd5 100644 --- a/python-Flask.spec +++ b/python-Flask.spec @@ -26,6 +26,7 @@ License: BSD-3-Clause Group: Development/Languages/Python URL: http://github.com/mitsuhiko/flask/ Source: https://files.pythonhosted.org/packages/source/F/Flask/Flask-%{version}.tar.gz +Patch0: python38-exception-test.patch BuildRequires: %{python_module Jinja2 >= 2.4} BuildRequires: %{python_module Werkzeug >= 0.15} BuildRequires: %{python_module click >= 5.1} @@ -60,6 +61,7 @@ reference for python-Flask. %prep %setup -q -n Flask-%{version} +%autopatch -p1 %build %python_build diff --git a/python38-exception-test.patch b/python38-exception-test.patch new file mode 100644 index 0000000..84bb67c --- /dev/null +++ b/python38-exception-test.patch @@ -0,0 +1,42 @@ +From c367a86cc5be70da4928b276d0218f98df6e854d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fernanda=20Guimar=C3=A3es?= +Date: Mon, 28 Oct 2019 21:37:25 -0300 +Subject: [PATCH] Test test_send_from_directory_bad_request no longer fails in + Python 3.8. + +--- + tests/test_helpers.py | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/tests/test_helpers.py b/tests/test_helpers.py +index 78a562213..21735af12 100644 +--- a/tests/test_helpers.py ++++ b/tests/test_helpers.py +@@ -11,6 +11,7 @@ + import datetime + import io + import os ++import sys + import uuid + + import pytest +@@ -780,12 +781,17 @@ def test_send_from_directory_pathlike(self, app, req_ctx): + assert rv.data.strip() == b"Hello Subdomain" + rv.close() + +- def test_send_from_directory_bad_request(self, app, req_ctx): ++ def test_send_from_directory_null_character(self, app, req_ctx): + app.root_path = os.path.join( + os.path.dirname(__file__), "test_apps", "subdomaintestmodule" + ) + +- with pytest.raises(BadRequest): ++ if sys.version_info >= (3, 8): ++ exception = NotFound ++ else: ++ exception = BadRequest ++ ++ with pytest.raises(exception): + flask.send_from_directory("static", "bad\x00") + +