From 38c03ce77f9f5fd0f65cc4dcdf0f321d7aa01cb0 Mon Sep 17 00:00:00 2001 From: starlet-dx <15929766099@163.com> Date: Wed, 11 Jan 2023 11:00:46 +0800 Subject: [PATCH 1/1] Allow charset normalizer >=2 and <4 (#6261) --- requests/__init__.py | 4 ++-- setup.cfg | 2 +- setup.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/requests/__init__.py b/requests/__init__.py index 7ac8e29..22db3c1 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 >= 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") diff --git a/setup.cfg b/setup.cfg index 0a94be6..906c0f1 100644 --- a/setup.cfg +++ b/setup.cfg @@ -4,7 +4,7 @@ provides-extra = socks use_chardet_on_py3 requires-dist = - charset_normalizer>=2,<3 + charset_normalizer>=2,<4 idna>=2.5,<4 urllib3>=1.21.1,<1.27 diff --git a/setup.py b/setup.py index 599533c..c6c0ad5 100755 --- a/setup.py +++ b/setup.py @@ -59,7 +59,7 @@ if sys.argv[-1] == "publish": sys.exit() requires = [ - "charset_normalizer>=2,<3", + "charset_normalizer>=2,<4", "idna>=2.5,<4", "urllib3>=1.21.1,<1.27", ] -- 2.30.0