From 52b292ba7875dbc4c6f4825ae03def649ffae15d Mon Sep 17 00:00:00 2001 From: deedy5 <65482418+deedy5@users.noreply.github.com> Date: Thu, 20 Oct 2022 10:04:34 +0000 Subject: [PATCH 1/6] charset_normalizer>=3,<4 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 23977ed77a..b679181bda 100755 --- a/setup.py +++ b/setup.py @@ -59,7 +59,7 @@ def run_tests(self): sys.exit() requires = [ - "charset_normalizer>=2,<3", + "charset_normalizer>=3,<4", "idna>=2.5,<4", "urllib3>=1.21.1,<1.27", "certifi>=2017.4.17", From f0616c31cb1181960ac474070ac6f0a65078e199 Mon Sep 17 00:00:00 2001 From: deedy5 <65482418+deedy5@users.noreply.github.com> Date: Thu, 20 Oct 2022 10:05:19 +0000 Subject: [PATCH 2/6] charset_normalizer>=3,<4 --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 33af66eb15..0c167eb8c9 100644 --- a/setup.cfg +++ b/setup.cfg @@ -5,7 +5,7 @@ provides-extra = use_chardet_on_py3 requires-dist = certifi>=2017.4.17 - charset_normalizer>=2,<3 + charset_normalizer>=3,<4 idna>=2.5,<4 urllib3>=1.21.1,<1.27 From 1bbeb3ce1b6b284734d7a27b6dec2db7b3299a89 Mon Sep 17 00:00:00 2001 From: deedy5 <65482418+deedy5@users.noreply.github.com> Date: Thu, 20 Oct 2022 14:28:23 +0000 Subject: [PATCH 3/6] Update Dependency with charset_normalizer >= 3.0.0 < 4.0.0 --- requests/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requests/__init__.py b/requests/__init__.py index 7ac8e297b8..5812c85d8a 100644 --- a/requests/__init__.py +++ b/requests/__init__.py @@ -80,8 +80,8 @@ def check_compatibility(urllib3_version, chardet_version, charset_normalizer_ver elif charset_normalizer_version: major, minor, patch = charset_normalizer_version.split(".")[:3] major, minor, patch = int(major), int(minor), int(patch) - # charset_normalizer >= 2.0.0 < 3.0.0 - assert (2, 0, 0) <= (major, minor, patch) < (3, 0, 0) + # charset_normalizer >= 3.0.0 < 4.0.0 + assert (3, 0, 0) <= (major, minor, patch) < (4, 0, 0) else: raise Exception("You need either charset_normalizer or chardet installed") From 73019a7f479c85a407808ab893d7a8487070fb25 Mon Sep 17 00:00:00 2001 From: deedy5 <65482418+deedy5@users.noreply.github.com> Date: Thu, 20 Oct 2022 16:09:27 +0000 Subject: [PATCH 4/6] charset_normalizer >= 2.0.0 < 4.0.0 --- requests/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requests/__init__.py b/requests/__init__.py index 5812c85d8a..22db3c1d7c 100644 --- a/requests/__init__.py +++ b/requests/__init__.py @@ -80,8 +80,8 @@ def check_compatibility(urllib3_version, chardet_version, charset_normalizer_ver elif charset_normalizer_version: major, minor, patch = charset_normalizer_version.split(".")[:3] major, minor, patch = int(major), int(minor), int(patch) - # charset_normalizer >= 3.0.0 < 4.0.0 - assert (3, 0, 0) <= (major, minor, patch) < (4, 0, 0) + # charset_normalizer >= 2.0.0 < 4.0.0 + assert (2, 0, 0) <= (major, minor, patch) < (4, 0, 0) else: raise Exception("You need either charset_normalizer or chardet installed") From 7026eb7a971c3e5be1fafd4768d6c193a2702267 Mon Sep 17 00:00:00 2001 From: deedy5 <65482418+deedy5@users.noreply.github.com> Date: Thu, 20 Oct 2022 16:09:58 +0000 Subject: [PATCH 5/6] charset_normalizer >= 2.0.0 < 4.0.0 --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 0c167eb8c9..bf21c81cc0 100644 --- a/setup.cfg +++ b/setup.cfg @@ -5,7 +5,7 @@ provides-extra = use_chardet_on_py3 requires-dist = certifi>=2017.4.17 - charset_normalizer>=3,<4 + charset_normalizer>=2,<4 idna>=2.5,<4 urllib3>=1.21.1,<1.27 From 215c3af6db4e854c9ea5c55cd1cc3deab75fec09 Mon Sep 17 00:00:00 2001 From: deedy5 <65482418+deedy5@users.noreply.github.com> Date: Thu, 20 Oct 2022 16:10:26 +0000 Subject: [PATCH 6/6] charset_normalizer >= 2.0.0 < 4.0.0 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index b679181bda..092b40d011 100755 --- a/setup.py +++ b/setup.py @@ -59,7 +59,7 @@ def run_tests(self): sys.exit() requires = [ - "charset_normalizer>=3,<4", + "charset_normalizer>=2,<4", "idna>=2.5,<4", "urllib3>=1.21.1,<1.27", "certifi>=2017.4.17",