From 3745b3d1af6c1020694bb69334964660a7e058aa Mon Sep 17 00:00:00 2001 From: Andrew Svetlov Date: Tue, 5 Oct 2021 12:21:00 +0300 Subject: [PATCH] Fix typos, drop mentions of Python<3.6 --- setup.py | 2 +- tests/test_url.py | 9 +-------- tests/test_url_parsing.py | 1 - yarl/_url.py | 2 +- 4 files changed, 3 insertions(+), 11 deletions(-) diff --git a/setup.py b/setup.py index 813efc494..e4abe90e5 100644 --- a/setup.py +++ b/setup.py @@ -73,7 +73,7 @@ def read(name): if not NO_EXTENSIONS: print("**********************") - print("* Accellerated build *") + print("* Accelerated build *") print("**********************") setup(ext_modules=extensions, **args) else: diff --git a/tests/test_url.py b/tests/test_url.py index fa9f89310..23fe45203 100644 --- a/tests/test_url.py +++ b/tests/test_url.py @@ -1,13 +1,9 @@ -import sys import pytest from urllib.parse import SplitResult from yarl import URL -@pytest.mark.skipif( - sys.version_info < (3, 6), reason="The feature requires Python 3.6+" -) def test_inheritance(): with pytest.raises(TypeError) as ctx: @@ -15,7 +11,7 @@ class MyURL(URL): # type: ignore[misc] pass assert ( - "Inheritance a class " + "Inheriting a class " ".MyURL'> " "from URL is forbidden" == str(ctx.value) ) @@ -1222,9 +1218,6 @@ def test_join_from_rfc_3986_normal(url, expected): ] -@pytest.mark.skipif( - sys.version_info < (3, 5), reason="Python 3.4 doen't support abnormal cases" -) @pytest.mark.parametrize("url,expected", ABNORMAL) def test_join_from_rfc_3986_abnormal(url, expected): # test case from https://tools.ietf.org/html/rfc3986.html#section-5.4.2 diff --git a/tests/test_url_parsing.py b/tests/test_url_parsing.py index 9d7a609fd..0a7f5f1df 100644 --- a/tests/test_url_parsing.py +++ b/tests/test_url_parsing.py @@ -254,7 +254,6 @@ def test_another_bad_port(self): with pytest.raises(ValueError): URL("//h:22:no/path") - @pytest.mark.skipif(sys.version_info < (3, 6), reason="Requires Python 3.6+") def test_bad_port_again(self): with pytest.raises(ValueError): URL("//h:-80/path") diff --git a/yarl/_url.py b/yarl/_url.py index 99c424514..30a50b8b1 100644 --- a/yarl/_url.py +++ b/yarl/_url.py @@ -261,7 +261,7 @@ def build( return url def __init_subclass__(cls): - raise TypeError("Inheritance a class {!r} from URL is forbidden".format(cls)) + raise TypeError("Inheriting a class {!r} from URL is forbidden".format(cls)) def __str__(self): val = self._val